diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 3e1cecedde42..f2b666756299 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <asm/pgtable.h> | 59 | #include <asm/pgtable.h> |
60 | #include <asm/tlbflush.h> | 60 | #include <asm/tlbflush.h> |
61 | #include <asm/mtrr.h> | 61 | #include <asm/mtrr.h> |
62 | #include <asm/nmi.h> | ||
63 | #include <asm/vmi.h> | 62 | #include <asm/vmi.h> |
64 | #include <asm/genapic.h> | 63 | #include <asm/genapic.h> |
65 | #include <linux/mc146818rtc.h> | 64 | #include <linux/mc146818rtc.h> |
@@ -1157,9 +1156,11 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
1157 | * If SMP should be disabled, then really disable it! | 1156 | * If SMP should be disabled, then really disable it! |
1158 | */ | 1157 | */ |
1159 | if (!max_cpus) { | 1158 | if (!max_cpus) { |
1160 | printk(KERN_INFO "SMP mode deactivated," | 1159 | printk(KERN_INFO "SMP mode deactivated.\n"); |
1161 | "forcing use of dummy APIC emulation.\n"); | ||
1162 | smpboot_clear_io_apic(); | 1160 | smpboot_clear_io_apic(); |
1161 | |||
1162 | localise_nmi_watchdog(); | ||
1163 | |||
1163 | #ifdef CONFIG_X86_32 | 1164 | #ifdef CONFIG_X86_32 |
1164 | connect_bsp_APIC(); | 1165 | connect_bsp_APIC(); |
1165 | #endif | 1166 | #endif |