aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2008-05-21 17:09:43 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 03:12:57 -0400
commit73d08e636026bbcb413d4864ca5e917502f8a0f9 (patch)
tree20faccd152f062ecbe681a2c55a6323322d7fe0e /arch/x86/kernel/smpboot.c
parent60134ebe795b728dbb960485a8e873c3250ada36 (diff)
x86: APIC/SMP: correct the message for "nosmp"
The local APIC is no longer forced off when "nosmp" has been specified. Correct the message printed. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 3e1cecedde42..8c53d86e3e86 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1157,8 +1157,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
1157 * If SMP should be disabled, then really disable it! 1157 * If SMP should be disabled, then really disable it!
1158 */ 1158 */
1159 if (!max_cpus) { 1159 if (!max_cpus) {
1160 printk(KERN_INFO "SMP mode deactivated," 1160 printk(KERN_INFO "SMP mode deactivated.\n");
1161 "forcing use of dummy APIC emulation.\n");
1162 smpboot_clear_io_apic(); 1161 smpboot_clear_io_apic();
1163#ifdef CONFIG_X86_32 1162#ifdef CONFIG_X86_32
1164 connect_bsp_APIC(); 1163 connect_bsp_APIC();