---

yaml --- r: 298306 b: refs/heads/master c: b892e5c h: refs/heads/master v: v3
git-mirror · Mar 2, 2012 · 8433f1e · 8433f1e
1 parent 1a72767
commit 8433f1e
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: 8c9cf542b8a66c231747a550573d910daf17f0e9
+refs/heads/master: b892e5c89787716b95a8e55d77d25a1c0748df10
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -36,6 +36,7 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 #include <linux/poll.h>
+#include <linux/nmi.h>
 #include <linux/fs.h>
 
 #include "trace.h"
@@ -4903,6 +4904,7 @@ __ftrace_dump(bool disable_tracing, enum ftrace_dump_mode oops_dump_mode)
 			if (ret != TRACE_TYPE_NO_CONSUME)
 				trace_consume(&iter);
 		}
+		touch_nmi_watchdog();
 
 		trace_printk_seq(&iter.seq);
 	}