From 8433f1e980adad2374210b57dc5a75ab8b55bad4 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 1 Mar 2012 22:06:48 -0500
Subject: [PATCH] --- yaml --- r: 298306 b: refs/heads/master c:
 b892e5c89787716b95a8e55d77d25a1c0748df10 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bd18d51553b1..1b36539f1364 100644
--- 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
index f3c13d63d064..3a19c354edd6 100644
--- 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);
 	}