From: Maciej W. Rozycki Date: Fri, 6 Jun 2008 02:28:13 +0000 (+0100) Subject: x86: APIC/SMP: Downgrade the NMI watchdog for "noapic" X-Git-Tag: v2.6.27-rc1~1106^2~251^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d788bada2f6c49673f85338ac4c0c642e5e52cff;p=linux-2.6-omap-h63xx.git x86: APIC/SMP: Downgrade the NMI watchdog for "noapic" 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 "noapic". 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/include/asm-x86/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h index 56d0e1fa025..b63c5218200 100644 --- a/include/asm-x86/mach-default/smpboot_hooks.h +++ b/include/asm-x86/mach-default/smpboot_hooks.h @@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void) */ if (!skip_ioapic_setup && nr_ioapics) setup_IO_APIC(); - else + else { nr_ioapics = 0; + localise_nmi_watchdog(); + } } static inline void smpboot_clear_io_apic(void)