1 files changed, 6 insertions, 1 deletions

diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 055b1650c69d..4e073320e70a 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -600,8 +600,13 @@ void die(const char * str, struct pt_regs * regs, long err)
 
 void __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic)
 {
-        unsigned long flags = oops_begin();
+        unsigned long flags;
+
+        if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) ==
+            NOTIFY_STOP)
+                return;
 
+        flags = oops_begin();
         /*
          * We are in trouble anyway, lets at least try
          * to get a message out.