diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2008-05-21 23:09:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:12:57 +0200 |
| commit | 73d08e636026bbcb413d4864ca5e917502f8a0f9 (patch) | |
| tree | 20faccd152f062ecbe681a2c55a6323322d7fe0e /arch/x86/kernel/smpboot.c | |
| parent | x86: I/O APIC: keep IRQ off when changing LVT registers (diff) | |
| download | linux-73d08e636026bbcb413d4864ca5e917502f8a0f9.tar.xz linux-73d08e636026bbcb413d4864ca5e917502f8a0f9.zip | |
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 '')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 3 |
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) * 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(); |