summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot_64.c
diff options
context:
space:
mode:
authorGlauber Costa2008-03-03 18:12:38 +0100
committerIngo Molnar2008-04-17 17:40:53 +0200
commit7557da67208f6ed3a1073594b7597bf20c9eb63a (patch)
treeee166a69da2df6588d78ba650579f163109f5f3d /arch/x86/kernel/smpboot_64.c
parentx86: unify prepare_boot_cpu (diff)
downloadkernel-qcow2-linux-7557da67208f6ed3a1073594b7597bf20c9eb63a.tar.gz
kernel-qcow2-linux-7557da67208f6ed3a1073594b7597bf20c9eb63a.tar.xz
kernel-qcow2-linux-7557da67208f6ed3a1073594b7597bf20c9eb63a.zip
x86: unify smp_prepare_cpus
definition is moved to common header. x86_64 version is now called native_smp_prepare_cpus Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
-rw-r--r--arch/x86/kernel/smpboot_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 47e654cdc92d..b106983050b0 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -867,7 +867,7 @@ static void __init smp_cpu_index_default(void)
* Prepare for SMP bootup. The MP table or ACPI has been read
* earlier. Just do some sanity checking here and enable APIC mode.
*/
-void __init smp_prepare_cpus(unsigned int max_cpus)
+void __init native_smp_prepare_cpus(unsigned int max_cpus)
{
nmi_watchdog_default();
smp_cpu_index_default();