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: Ingo Molnar <[email protected]>
svenkatr · Jun 8, 2012 · 9ee6ddc · 9ee6ddc
2 parents db0dc75 + f2bf1f6
commit 9ee6ddc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
@@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(tracing_on);
 void tracing_off(void)
 {
 	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
 	 * allocated yet. We don't really care about the race