diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 12:12:38 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:53 -0400 |
commit | 7557da67208f6ed3a1073594b7597bf20c9eb63a (patch) | |
tree | ee166a69da2df6588d78ba650579f163109f5f3d /arch/x86/kernel/smpboot_64.c | |
parent | 1e3fac83da056f26bcb96e13967c157de55bf2ef (diff) |
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.c | 2 |
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) | |||
867 | * Prepare for SMP bootup. The MP table or ACPI has been read | 867 | * Prepare for SMP bootup. The MP table or ACPI has been read |
868 | * earlier. Just do some sanity checking here and enable APIC mode. | 868 | * earlier. Just do some sanity checking here and enable APIC mode. |
869 | */ | 869 | */ |
870 | void __init smp_prepare_cpus(unsigned int max_cpus) | 870 | void __init native_smp_prepare_cpus(unsigned int max_cpus) |
871 | { | 871 | { |
872 | nmi_watchdog_default(); | 872 | nmi_watchdog_default(); |
873 | smp_cpu_index_default(); | 873 | smp_cpu_index_default(); |