diff --git a/[refs] b/[refs]
index 5313b5fb610a..e1c38213527b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a41de48b81e61fbe260ae5031ebcb6f935f35fb
+refs/heads/master: 1c978b935e81da9434342f0bc8263c6cfe1214ce
diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c
index 6963b64a76ca..74cbeb2e99a6 100644
--- a/trunk/arch/x86_64/kernel/traps.c
+++ b/trunk/arch/x86_64/kernel/traps.c
@@ -330,6 +330,7 @@ static int print_trace_stack(void *data, char *name)
 
 static void print_trace_address(void *data, unsigned long addr)
 {
+	touch_nmi_watchdog();
 	printk_address(addr);
 }