---

yaml --- r: 43117 b: refs/heads/master c: a36df98 h: refs/heads/master i: 43115: cf66416 v: v3
git-mirror · Dec 7, 2006 · fe8a707 · fe8a707
1 parent cc6e315
commit fe8a707
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);