summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-03 16:02:16 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-03 16:02:16 +0100
commit3612fdf780e28b10323dd12d2b0f306c7ada4d4c (patch)
tree6749928731df6d9fd5da502d6c16dc656b64850e
parent654952bcb999ad96e1d9ae9145fe5c0522ec297a (diff)
parent633ddaa7f471e9db181f993c1458d6f4bae321ca (diff)
downloadblackbird-op-linux-3612fdf780e28b10323dd12d2b0f306c7ada4d4c.tar.gz
blackbird-op-linux-3612fdf780e28b10323dd12d2b0f306c7ada4d4c.zip
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
-rw-r--r--kernel/trace/trace_events_stage_3.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index c62a4d2a5283..041789ffbac1 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; \
} \
\
OpenPOWER on IntegriCloud