From 556d1aa81a65306248c5a98230cacbcd07d801b5 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek <konrad@darnok.org>
Date: Tue, 17 Jul 2007 04:03:56 -0700
Subject: [PATCH] --- yaml --- r: 60775 b: refs/heads/master c:
 1c978b935e81da9434342f0bc8263c6cfe1214ce h: refs/heads/master i:   60773:
 c62111e4e28f17b92c68979e8a9887c8a48d16d6   60771:
 91a463b5c72d27b0e5f7ee23c86579955bb9235d   60767:
 36ab7479d02ae9dad4e124606a28f81d620eec1f v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/traps.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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);
 }