From f545faa6b904ae8589007a58c2d5270b415f25a3 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 14 Jan 2009 14:50:19 -0500
Subject: [PATCH] --- yaml --- r: 140631 b: refs/heads/master c:
 0ee6b6cf5bdb793b4c68507dd65adf16341aa4ca h: refs/heads/master i:   140629:
 0e595a00d2b40ffa07b4a0d461ae2476533ff1d9   140627:
 fe45ed0da4486459a61f0885aef7389c776e0e27   140623:
 8b1f9f95545da8f5e34724e90e51d6501dd6fec6 v: v3

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

diff --git a/[refs] b/[refs]
index abac2c006c1c..cc80c6778e1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f3b34402e7282cde49dff395d7ea462bf33bf50
+refs/heads/master: 0ee6b6cf5bdb793b4c68507dd65adf16341aa4ca
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 408c03f2b8a9..dcb757f70d21 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -3110,6 +3110,7 @@ void ftrace_dump(void)
 	dump_ran = 1;
 
 	/* No turning back! */
+	tracing_off();
 	ftrace_kill();
 
 	for_each_tracing_cpu(cpu) {