summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2008-06-06 03:27:41 +0100
committerIngo Molnar <mingo@elte.hu>2008-07-08 09:13:16 +0200
commit148b50830993acc67129f09c544d9167291e5458 (patch)
tree595bcdaa81728036d990488f7b746602a510478a
parent6fe9fe875691e15eda61b992e03257e68aa5ba4f (diff)
downloadlinux-148b50830993acc67129f09c544d9167291e5458.tar.bz2
x86: NMI watchdog: Downgrade helper
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@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/nmi.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
index 1e363021e72f..745d8c847de5 100644
--- a/include/asm-x86/nmi.h
+++ b/include/asm-x86/nmi.h
@@ -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);