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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 1168e4454188..51ef893ffa65 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -400,7 +400,12 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
400 if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT) 400 if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)
401 == NOTIFY_STOP) 401 == NOTIFY_STOP)
402 return; 402 return;
403
403#ifdef CONFIG_X86_LOCAL_APIC 404#ifdef CONFIG_X86_LOCAL_APIC
405 if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT)
406 == NOTIFY_STOP)
407 return;
408
404 /* 409 /*
405 * Ok, so this is none of the documented NMI sources, 410 * Ok, so this is none of the documented NMI sources,
406 * so it must be the NMI watchdog. 411 * so it must be the NMI watchdog.