diff --git a/[refs] b/[refs] index a42109545781..3bb1d4b46e04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: faf6861ebd776871e77b761c43ec045cd20b5716 +refs/heads/master: a442e5e0a2011af5b2d1f118fee0a8f9079f1d88 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 1a1c5a6ab24e..4d89e84f0f4b 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -3770,6 +3770,7 @@ void ftrace_dump(void) dump_ran = 1; /* No turning back! */ + tracing_off(); ftrace_kill(); for_each_tracing_cpu(cpu) {