Skip to content

Commit

Permalink
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
  • Loading branch information
Ingo Molnar committed Mar 3, 2009
2 parents 654952b + 633ddaa commit 3612fdf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions kernel/trace/trace_events_stage_3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
} \
\
Expand Down Expand Up @@ -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; \
} \
\
Expand Down

0 comments on commit 3612fdf

Please sign in to comment.