[PATCH][GIT PULL] tracing: Fix setting tracer specific options

[Steven Rostedt]

Ingo,

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

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


Steven Rostedt (1):
      tracing: Fix setting tracer specific options

----
 kernel/trace/trace.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---------------------------
commit c757bea93bea4b77ebd181cc6dca60c15e3b1a2c
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Mon Dec 21 22:35:16 2009 -0500

    tracing: Fix setting tracer specific options
    
    The function __set_tracer_option() takes as its last parameter a
    "neg" value. If set it should negate the value of the option.
    
    The trace_options_write() passed the value written to the file
    which is what the new value needs to be set as. But since this
    is not the negative, it never sets the value.
    
    Reported-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ee61915..d0a4c12 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3949,7 +3949,7 @@ trace_options_write(struct file *filp, const char __user *ubuf, size_t cnt,
 	if (!!(topt->flags->val & topt->opt->bit) != val) {
 		mutex_lock(&trace_types_lock);
 		ret = __set_tracer_option(current_trace, topt->flags,
-					  topt->opt, val);
+					  topt->opt, !val);
 		mutex_unlock(&trace_types_lock);
 		if (ret)
 			return ret;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/