[PATCH 1/5] x86: NMI watchdog: Downgrade helper

[Maciej W. Rozycki]

 A downgrade helper for the NMI watchdog to be used in all places where 
the I/O APIC watchdog may have been requested, but the I/O APIC is found 
not to be there or meant to be left disabled.  This is so that the 
reconfiguration is cosistent and defined in a single place only.

Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
---
patch-2.6.26-rc1-20080505-nmiwd-local-0
diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/include/asm-x86/nmi.h linux-2.6.26-rc1-20080505/include/asm-x86/nmi.h
--- linux-2.6.26-rc1-20080505.macro/include/asm-x86/nmi.h	2008-05-05 02:55:57.000000000 +0000
+++ linux-2.6.26-rc1-20080505/include/asm-x86/nmi.h	2008-06-05 19:56:30.000000000 +0000
@@ -78,6 +78,11 @@ extern int unknown_nmi_panic;
 void __trigger_all_cpu_backtrace(void);
 #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()
 
+static inline void localise_nmi_watchdog(void)
+{
+	if (nmi_watchdog == NMI_IO_APIC)
+		nmi_watchdog = NMI_LOCAL_APIC;
+}
 #endif
 
 void lapic_watchdog_stop(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/