aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/traps.c')
-rw-r--r--arch/x86/kernel/traps.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index ffb131f74f78..e062974cce34 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -429,43 +429,6 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
429 printk(KERN_EMERG "Dazed and confused, but trying to continue\n"); 429 printk(KERN_EMERG "Dazed and confused, but trying to continue\n");
430} 430}
431 431
432#ifdef CONFIG_X86_32
433static DEFINE_SPINLOCK(nmi_print_lock);
434
435void notrace __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic)
436{
437 if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)
438 return;
439
440 spin_lock(&nmi_print_lock);
441 /*
442 * We are in trouble anyway, lets at least try
443 * to get a message out:
444 */
445 bust_spinlocks(1);
446 printk(KERN_EMERG "%s", str);
447 printk(" on CPU%d, ip %08lx, registers:\n",
448 smp_processor_id(), regs->ip);
449 show_registers(regs);
450 if (do_panic)
451 panic("Non maskable interrupt");
452 console_silent();
453 spin_unlock(&nmi_print_lock);
454 bust_spinlocks(0);
455
456 /*
457 * If we are in kernel we are probably nested up pretty bad
458 * and might aswell get out now while we still can:
459 */
460 if (!user_mode_vm(regs)) {
461 current->thread.trap_no = 2;
462 crash_kexec(regs);
463 }
464
465 do_exit(SIGSEGV);
466}
467#endif
468
469static notrace __kprobes void default_do_nmi(struct pt_regs *regs) 432static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
470{ 433{
471 unsigned char reason = 0; 434 unsigned char reason = 0;