diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-06-06 19:50:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 11:36:55 -0700 |
| commit | 3993b24649773080897fde524ea2d9f311eba2aa (patch) | |
| tree | 22cbe6a20e2d52c2886c309a6307cce4364734f0 | |
| parent | d946d96cd89b13fc354b6f7ed2c4de3e72c87d8e (diff) | |
| download | linux-stable-3993b24649773080897fde524ea2d9f311eba2aa.tar.gz linux-stable-3993b24649773080897fde524ea2d9f311eba2aa.tar.bz2 linux-stable-3993b24649773080897fde524ea2d9f311eba2aa.zip | |
tracing: Have tracing_off() actually turn tracing off
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>
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2a22255c1010..464a96f3d4c0 100644 --- 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 |