Commit 9ee6ddc9 authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'tip/perf/urgent' of...

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull brown paper bag fix from Steve Rostedt.
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents db0dc75d f2bf1f6f
...@@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(tracing_on); ...@@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(tracing_on);
void tracing_off(void) void tracing_off(void)
{ {
if (global_trace.buffer) if (global_trace.buffer)
ring_buffer_record_on(global_trace.buffer); ring_buffer_record_off(global_trace.buffer);
/* /*
* This flag is only looked at when buffers haven't been * This flag is only looked at when buffers haven't been
* allocated yet. We don't really care about the race * allocated yet. We don't really care about the race
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment