Commit d788bada authored Jun 06, 2008 by Maciej W. Rozycki Committed by Ingo Molnar Jul 08, 2008

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 <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent d54db1ac

include/asm-x86/mach-default/smpboot_hooks.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -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)