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: Ingo Molnar <mingo@kernel.org>

parents db0dc75d f2bf1f6f

kernel/trace/trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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