From fe8a707a4693c4178f69c91325eb8b5802e2e4e6 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Thu, 7 Dec 2006 02:14:12 +0100
Subject: [PATCH] --- yaml --- r: 43117 b: refs/heads/master c:
 a36df98ab1cdd8a9e7daa4c1b5c48ffa2ad6ea09 h: refs/heads/master i:   43115:
 cf66416340d84cf7754d10b71a39703225f30e01 v: v3

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

diff --git a/[refs] b/[refs]
index 3ba8a616209d..caaaf3fb3a64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c45718b3c0d3045eab803cd15fabbed1ea5bcd
+refs/heads/master: a36df98ab1cdd8a9e7daa4c1b5c48ffa2ad6ea09
diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c
index 1d48a75fa338..86d8476be4fe 100644
--- a/trunk/arch/i386/kernel/traps.c
+++ b/trunk/arch/i386/kernel/traps.c
@@ -29,6 +29,7 @@
 #include <linux/kexec.h>
 #include <linux/unwind.h>
 #include <linux/uaccess.h>
+#include <linux/nmi.h>
 
 #ifdef CONFIG_EISA
 #include <linux/ioport.h>
@@ -248,6 +249,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
 		stack = (unsigned long*)context->previous_esp;
 		if (!stack)
 			break;
+		touch_nmi_watchdog();
 	}
 }
 EXPORT_SYMBOL(dump_trace);