x86: APIC/SMP: Downgrade the NMI watchdog for "noapic"
authorMaciej W. Rozycki <macro@linux-mips.org>
Fri, 6 Jun 2008 02:28:13 +0000 (03:28 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:13:20 +0000 (09:13 +0200)
 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>
include/asm-x86/mach-default/smpboot_hooks.h

index 56d0e1fa025895d1af57588e22a44820ec08a59e..b63c5218200619dbbb746a9716eec939a68fa93e 100644 (file)
@@ -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)