diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 17:55:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 17:55:31 -0400 |
| commit | e2b8b2808538a91444e78c7db5a30519cadd09b2 (patch) | |
| tree | 60c45581817db746bd61670f5c95b19c2661daa0 /kernel/trace/trace_export.c | |
| parent | 4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (diff) | |
| parent | ef18012b248b47ec9a12c3a83ca5e99782d39c5d (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_export.c')
| -rw-r--r-- | kernel/trace/trace_export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c index 23ae78430d58..4d9952d3df50 100644 --- a/kernel/trace/trace_export.c +++ b/kernel/trace/trace_export.c | |||
| @@ -94,7 +94,7 @@ ftrace_format_##call(struct trace_seq *s) \ | |||
| 94 | static struct ftrace_event_call __used \ | 94 | static struct ftrace_event_call __used \ |
| 95 | __attribute__((__aligned__(4))) \ | 95 | __attribute__((__aligned__(4))) \ |
| 96 | __attribute__((section("_ftrace_events"))) event_##call = { \ | 96 | __attribute__((section("_ftrace_events"))) event_##call = { \ |
| 97 | .name = #call, \ | 97 | .name = #call, \ |
| 98 | .id = proto, \ | 98 | .id = proto, \ |
| 99 | .system = __stringify(TRACE_SYSTEM), \ | 99 | .system = __stringify(TRACE_SYSTEM), \ |
| 100 | .show_format = ftrace_format_##call, \ | 100 | .show_format = ftrace_format_##call, \ |