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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index bdc7fab3ef3..bd347c2b34d 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -406,7 +406,7 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
406 == NOTIFY_STOP) 406 == NOTIFY_STOP)
407 return; 407 return;
408 408
409#ifndef CONFIG_NMI_WATCHDOG 409#ifndef CONFIG_LOCKUP_DETECTOR
410 /* 410 /*
411 * Ok, so this is none of the documented NMI sources, 411 * Ok, so this is none of the documented NMI sources,
412 * so it must be the NMI watchdog. 412 * so it must be the NMI watchdog.
@@ -414,7 +414,7 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
414 if (nmi_watchdog_tick(regs, reason)) 414 if (nmi_watchdog_tick(regs, reason))
415 return; 415 return;
416 if (!do_nmi_callback(regs, cpu)) 416 if (!do_nmi_callback(regs, cpu))
417#endif /* !CONFIG_NMI_WATCHDOG */ 417#endif /* !CONFIG_LOCKUP_DETECTOR */
418 unknown_nmi_error(reason, regs); 418 unknown_nmi_error(reason, regs);
419#else 419#else
420 unknown_nmi_error(reason, regs); 420 unknown_nmi_error(reason, regs);