From: Maciej W. Rozycki Date: Wed, 21 May 2008 21:09:43 +0000 (+0100) Subject: x86: APIC/SMP: correct the message for "nosmp" X-Git-Tag: v2.6.27-rc1~1106^2~251^2~29 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=73d08e636026bbcb413d4864ca5e917502f8a0f9;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 3e1cecedde4..8c53d86e3e8 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) * If SMP should be disabled, then really disable it! */ if (!max_cpus) { - printk(KERN_INFO "SMP mode deactivated," - "forcing use of dummy APIC emulation.\n"); + printk(KERN_INFO "SMP mode deactivated.\n"); smpboot_clear_io_apic(); #ifdef CONFIG_X86_32 connect_bsp_APIC();