Commit f2bf1f6f authored Jun 06, 2012 by Steven Rostedt Committed by Steven Rostedt Jun 06, 2012

tracing: Have tracing_off() actually turn tracing off



A recent update to have tracing_on/off() only affect the ftrace ring
buffers instead of all ring buffers had a cut and paste error.
The tracing_off() did the exact same thing as tracing_on() and
would not actually turn off tracing. Unfortunately, tracing_off()
is more important to be working than tracing_on() as this is a key
development tool, as it lets the developer turn off tracing as soon
as a problem is discovered. It is also used by panic and oops code.

This bug also breaks the 'echo func:traceoff > set_ftrace_filter'

Cc: <stable@vger.kernel.org> # 3.4
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 5041caa4

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

Admin message