lkml.org 
[lkml]   [2012]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH][GIT PULL][3.5] tracing: Have tracing_off() actually turn tracing off (and not on!)
From
Date

Ingo,

This was one of those "oh crap" moments. I was adding a feature request
by Arnaldo, and found that tracing_off() wasn't working. This is
something I know Thomas and Peter use often and I'm lucky that I found
it before I had to go dig another dead frozen shark out of my rafters.

It was a silly cut and paste bug from a previous change (that happened
to make it into 3.4).


Please pull the latest tip/perf/urgent tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/urgent

Head SHA1: f2bf1f6f5f89d031245067512449fc889b2f4bb2


Steven Rostedt (1):
tracing: Have tracing_off() actually turn tracing off

----
kernel/trace/trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit f2bf1f6f5f89d031245067512449fc889b2f4bb2
Author: Steven Rostedt <srostedt@redhat.com>
Date: Wed Jun 6 19:50:40 2012 -0400

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>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 68032c6..49249c2 100644
--- 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



\
 
 \ /
  Last update: 2012-06-07 05:01    [W:0.023 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site