[PATCH 5/5] x86: APIC/SMP: Downgrade the NMI watchdog for "noapic"

[Maciej W. Rozycki]

 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@xxxxxxxxxxxxxx>
---
patch-2.6.26-rc1-20080505-noapic-watchdog-0
diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/include/asm-x86/mach-default/smpboot_hooks.h linux-2.6.26-rc1-20080505/include/asm-x86/mach-default/smpboot_hooks.h
--- linux-2.6.26-rc1-20080505.macro/include/asm-x86/mach-default/smpboot_hooks.h	2008-05-05 02:55:57.000000000 +0000
+++ linux-2.6.26-rc1-20080505/include/asm-x86/mach-default/smpboot_hooks.h	2008-06-05 22:11:30.000000000 +0000
@@ -41,8 +41,10 @@ static inline void __init smpboot_setup_
 	 */
 	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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/