| From f2bf1f6f5f89d031245067512449fc889b2f4bb2 Mon Sep 17 00:00:00 2001 |
| From: Steven Rostedt <srostedt@redhat.com> |
| Date: Wed, 6 Jun 2012 19:50:40 -0400 |
| Subject: tracing: Have tracing_off() actually turn tracing off |
| |
| From: Steven Rostedt <srostedt@redhat.com> |
| |
| commit f2bf1f6f5f89d031245067512449fc889b2f4bb2 upstream. |
| |
| 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' |
| |
| Signed-off-by: Steven Rostedt <rostedt@goodmis.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/trace/trace.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/trace/trace.c |
| +++ b/kernel/trace/trace.c |
| @@ -383,7 +383,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 |
