---

yaml --- r: 140631 b: refs/heads/master c: 0ee6b6c h: refs/heads/master i: 140629: 0e595a0 140627: fe45ed0 140623: 8b1f9f9 v: v3
git-mirror · Jan 15, 2009 · f545faa · f545faa
1 parent e5f3107
commit f545faa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -3110,6 +3110,7 @@ void ftrace_dump(void)
 	dump_ran = 1;
 
 	/* No turning back! */
+	tracing_off();
 	ftrace_kill();
 
 	for_each_tracing_cpu(cpu) {