diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-03 10:02:16 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-03 10:02:16 -0500 |
| commit | 3612fdf780e28b10323dd12d2b0f306c7ada4d4c (patch) | |
| tree | 6749928731df6d9fd5da502d6c16dc656b64850e | |
| parent | 654952bcb999ad96e1d9ae9145fe5c0522ec297a (diff) | |
| parent | 633ddaa7f471e9db181f993c1458d6f4bae321ca (diff) | |
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.h | 8 |
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) \ | |||
| 120 | int ret; \ | 120 | int ret; \ |
| 121 | \ | 121 | \ |
| 122 | ret = register_trace_##call(ftrace_event_##call); \ | 122 | ret = register_trace_##call(ftrace_event_##call); \ |
| 123 | if (!ret) \ | 123 | if (ret) \ |
| 124 | pr_info("event trace: Could not activate trace point " \ | 124 | pr_info("event trace: Could not activate trace point " \ |
| 125 | "probe to " #call); \ | 125 | "probe to " #call "\n"); \ |
| 126 | return ret; \ | 126 | return ret; \ |
| 127 | } \ | 127 | } \ |
| 128 | \ | 128 | \ |
| @@ -195,9 +195,9 @@ static int ftrace_raw_reg_event_##call(void) \ | |||
| 195 | int ret; \ | 195 | int ret; \ |
| 196 | \ | 196 | \ |
| 197 | ret = register_trace_##call(ftrace_raw_event_##call); \ | 197 | ret = register_trace_##call(ftrace_raw_event_##call); \ |
| 198 | if (!ret) \ | 198 | if (ret) \ |
| 199 | pr_info("event trace: Could not activate trace point " \ | 199 | pr_info("event trace: Could not activate trace point " \ |
| 200 | "probe to " #call); \ | 200 | "probe to " #call "\n"); \ |
| 201 | return ret; \ | 201 | return ret; \ |
| 202 | } \ | 202 | } \ |
| 203 | \ | 203 | \ |