[PATCH][GIT PULL] fix for tip/tracing/ftrace

[PATCH][GIT PULL] fix for tip/tracing/ftrace

[Steven Rostedt]

Ingo,

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

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


Steven Rostedt (1):
      tracing: fix return value to registering events

----
 kernel/trace/trace_events_stage_3.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---------------------------
commit 633ddaa7f471e9db181f993c1458d6f4bae321ca
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Tue Mar 3 09:43:50 2009 -0500

    tracing: fix return value to registering events
    
    The registering of events had the return value check backwards.
    A zero returned is success, the check had it as a failure.
    
    This patch also fixes a missing "\n" in the warning that the check
    failed.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>

diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index c62a4d2..041789f 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -120,9 +120,9 @@ static int ftrace_reg_event_##call(void)				\
 	int ret;							\
 									\
 	ret = register_trace_##call(ftrace_event_##call);		\
-	if (!ret)							\
+	if (ret)							\
 		pr_info("event trace: Could not activate trace point "	\
-			"probe to " #call);				\
+			"probe to " #call "\n");			\
 	return ret;							\
 }									\
 									\
@@ -195,9 +195,9 @@ static int ftrace_raw_reg_event_##call(void)				\
 	int ret;							\
 									\
 	ret = register_trace_##call(ftrace_raw_event_##call);		\
-	if (!ret)							\
+	if (ret)							\
 		pr_info("event trace: Could not activate trace point "	\
-			"probe to " #call);				\
+			"probe to " #call "\n");			\
 	return ret;							\
 }									\
 									\

Re: [PATCH][GIT PULL] fix for tip/tracing/ftrace

[Ingo Molnar]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> Ingo,
> 
> Please pull the latest tip/tracing/ftrace tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/tracing/ftrace
> 
> 
> Steven Rostedt (1):
>       tracing: fix return value to registering events
> 
> ----
>  kernel/trace/trace_events_stage_3.h |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)

Pulled, thanks Steve!

	Ingo