x86: APIC/SMP: correct the message for "nosmp"
authorMaciej W. Rozycki <macro@linux-mips.org>
Wed, 21 May 2008 21:09:43 +0000 (22:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:12:57 +0000 (09:12 +0200)
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>
arch/x86/kernel/smpboot.c

index 3e1cecedde42747261c94053a53191ffa7291107..8c53d86e3e86d1d8e6dac6407db57a791264c56d 100644 (file)
@@ -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();