diff --git a/[refs] b/[refs]
index 8bd016f86733..025141088f2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e85ceae9102f6e3c1d707e7ac88fa48d252e9cfa
+refs/heads/master: cc1e0f4f7ad95a9eb81e1904cb16068af226180d
diff --git a/trunk/kernel/kgdb.c b/trunk/kernel/kgdb.c
index 25d955dbb989..e4dcfb2272a4 100644
--- a/trunk/kernel/kgdb.c
+++ b/trunk/kernel/kgdb.c
@@ -590,6 +590,7 @@ static void kgdb_wait(struct pt_regs *regs)
 
 	/* Signal the primary CPU that we are done: */
 	atomic_set(&cpu_in_kgdb[cpu], 0);
+	touch_softlockup_watchdog();
 	clocksource_touch_watchdog();
 	local_irq_restore(flags);
 }
@@ -1432,6 +1433,7 @@ kgdb_handle_exception(int evector, int signo, int ecode, struct pt_regs *regs)
 	    atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
 
 		atomic_set(&kgdb_active, -1);
+		touch_softlockup_watchdog();
 		clocksource_touch_watchdog();
 		local_irq_restore(flags);
 
@@ -1524,6 +1526,7 @@ kgdb_handle_exception(int evector, int signo, int ecode, struct pt_regs *regs)
 kgdb_restore:
 	/* Free kgdb_active */
 	atomic_set(&kgdb_active, -1);
+	touch_softlockup_watchdog();
 	clocksource_touch_watchdog();
 	local_irq_restore(flags);