aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86_64/nmi.h
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 10:52:27 +0200
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 10:52:27 +0200
commitfac58550e80c307bf17cfa0dd544fca4eff120a5 (patch)
tree04eb287f3dd1bb2d7e9887e4d25073ca9794fa27 /include/asm-x86_64/nmi.h
parent4038f901cf102a40715b900984ed7540a9fa637f (diff)
[PATCH] Fix up panic messages for different NMI panics
When a unknown NMI happened the panic would claim a NMI watchdog timeout. Also it would check the variable set by nmi_watchdog=panic and panic then. Fix up the panic message to be generic Unconditionally panic on unknown NMI when panic on unknown nmi is enabled. Noticed by Jan Beulich Cc: jbeulich@novell.com Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include/asm-x86_64/nmi.h')
-rw-r--r--include/asm-x86_64/nmi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h
index 57859649427..cbf2669bca7 100644
--- a/include/asm-x86_64/nmi.h
+++ b/include/asm-x86_64/nmi.h
@@ -37,7 +37,7 @@ static inline void unset_nmi_pm_callback(struct pm_dev * dev)
#endif /* CONFIG_PM */
extern void default_do_nmi(struct pt_regs *);
-extern void die_nmi(char *str, struct pt_regs *regs);
+extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
#define get_nmi_reason() inb(0x61)