2 files changed, 10 insertions, 1 deletions

diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 7d651adcb222..8c7e555f6d39 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -370,6 +370,8 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
                 ptr = &remcomInBuffer[1];
                 if (kgdb_hex2long(&ptr, &addr))
                         linux_regs->ip = addr;
+        case 'D':
+        case 'k':
                 newPC = linux_regs->ip;
 
                 /* clear the trace bit */
@@ -480,6 +482,8 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
         if (kgdb_handle_exception(args->trapnr, args->signr, args->err, regs))
                 return NOTIFY_DONE;
 
+        /* Must touch watchdog before return to normal operation */
+        touch_nmi_watchdog();
         return NOTIFY_STOP;
 }
 
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.