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) {