From: Maciej W. Rozycki Date: Wed, 21 May 2008 21:10:16 +0000 (+0100) Subject: x86: APIC/SMP: downgrade the NMI watchdog for "nosmp" X-Git-Tag: v2.6.27-rc1~1106^2~251^2~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a1133d8e4ffc2db751eb987a2f3cf8ead67927c3;p=linux-2.6-omap-h63xx.git x86: APIC/SMP: downgrade the NMI watchdog for "nosmp" If configured to use the I/O APIC, the NMI watchdog is deemed to fail if the chip has been deactivated as a result of "nosmp". Downgrade to the local APIC watchdog similarly to what is done for the UP case. 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 8c53d86e3e8..df60bc7c9cb 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1159,6 +1159,10 @@ static int __init smp_sanity_check(unsigned max_cpus) if (!max_cpus) { printk(KERN_INFO "SMP mode deactivated.\n"); smpboot_clear_io_apic(); + + if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) + nmi_watchdog = NMI_LOCAL_APIC; + #ifdef CONFIG_X86_32 connect_bsp_APIC(); #endif