diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:27 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:27 -0400 |
| commit | fac58550e80c307bf17cfa0dd544fca4eff120a5 (patch) | |
| tree | 04eb287f3dd1bb2d7e9887e4d25073ca9794fa27 /include | |
| parent | 4038f901cf102a40715b900984ed7540a9fa637f (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')
| -rw-r--r-- | include/asm-x86_64/nmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h index 578596494275..cbf2669bca71 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) | |||
| 37 | #endif /* CONFIG_PM */ | 37 | #endif /* CONFIG_PM */ |
| 38 | 38 | ||
| 39 | extern void default_do_nmi(struct pt_regs *); | 39 | extern void default_do_nmi(struct pt_regs *); |
| 40 | extern void die_nmi(char *str, struct pt_regs *regs); | 40 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); |
| 41 | 41 | ||
| 42 | #define get_nmi_reason() inb(0x61) | 42 | #define get_nmi_reason() inb(0x61) |
| 43 | 43 | ||