Signed-off-by: Andrew Morton --- arch/x86_64/kernel/nmi.c | 5 +++-- arch/x86_64/kernel/traps.c | 7 +++---- include/asm-x86_64/nmi.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff -puN arch/x86_64/kernel/nmi.c~x86_64-mm-unknown-nmi-panic arch/x86_64/kernel/nmi.c --- a/arch/x86_64/kernel/nmi.c~x86_64-mm-unknown-nmi-panic +++ a/arch/x86_64/kernel/nmi.c @@ -695,7 +695,8 @@ int __kprobes nmi_watchdog_tick(struct p */ local_inc(&__get_cpu_var(alert_counter)); if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz) - die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs); + die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs, + panic_on_timeout); } else { __get_cpu_var(last_irq_sum) = sum; local_set(&__get_cpu_var(alert_counter), 0); @@ -765,7 +766,7 @@ static int unknown_nmi_panic_callback(st char buf[64]; sprintf(buf, "NMI received for unknown reason %02x\n", reason); - die_nmi(buf,regs); + die_nmi(buf, regs, 1); /* Always panic here */ return 0; } diff -puN arch/x86_64/kernel/traps.c~x86_64-mm-unknown-nmi-panic arch/x86_64/kernel/traps.c --- a/arch/x86_64/kernel/traps.c~x86_64-mm-unknown-nmi-panic +++ a/arch/x86_64/kernel/traps.c @@ -567,7 +567,7 @@ void die(const char * str, struct pt_reg do_exit(SIGSEGV); } -void __kprobes die_nmi(char *str, struct pt_regs *regs) +void __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic) { unsigned long flags = oops_begin(); @@ -579,9 +579,8 @@ void __kprobes die_nmi(char *str, struct show_registers(regs); if (kexec_should_crash(current)) crash_kexec(regs); - if (panic_on_timeout || panic_on_oops) - panic("nmi watchdog"); - printk("console shuts up ...\n"); + if (do_panic || panic_on_oops) + panic("Non maskable interrupt"); oops_end(flags); nmi_exit(); local_irq_enable(); diff -puN include/asm-x86_64/nmi.h~x86_64-mm-unknown-nmi-panic include/asm-x86_64/nmi.h --- a/include/asm-x86_64/nmi.h~x86_64-mm-unknown-nmi-panic +++ a/include/asm-x86_64/nmi.h @@ -37,7 +37,7 @@ static inline void unset_nmi_pm_callback #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) _