diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-03-10 00:15:34 -0400 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-10 00:35:12 -0400 |
| commit | 157587d7ac555458da9f682e3250135e468470a6 (patch) | |
| tree | 81033336672eb821f3833a1667bedfc646a3a6f5 /kernel | |
| parent | d6e2ca4c05be6a5ab16030a9f227301bd6acc9f0 (diff) | |
tracing: remove obsolete TRACE_EVENT_FORMAT macro
Impact: clean up
The TRACE_EVENT_FORMAT macro is no longer used by trace points
and only the DECLARE_TRACE, TRACE_FORMAT or TRACE_EVENT macros should
be used by them. Although the TRACE_EVENT_FORMAT macro is still used
by the internal tracing utility, it should not be used in core
kernel code.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events_stage_1.h | 3 | ||||
| -rw-r--r-- | kernel/trace/trace_events_stage_3.h | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/kernel/trace/trace_events_stage_1.h b/kernel/trace/trace_events_stage_1.h index edfcbd3a0d1b..15e9bf965a18 100644 --- a/kernel/trace/trace_events_stage_1.h +++ b/kernel/trace/trace_events_stage_1.h | |||
| @@ -17,9 +17,6 @@ | |||
| 17 | #undef TRACE_FORMAT | 17 | #undef TRACE_FORMAT |
| 18 | #define TRACE_FORMAT(call, proto, args, fmt) | 18 | #define TRACE_FORMAT(call, proto, args, fmt) |
| 19 | 19 | ||
| 20 | #undef TRACE_EVENT_FORMAT | ||
| 21 | #define TRACE_EVENT_FORMAT(name, proto, args, fmt, tstruct, tpfmt) | ||
| 22 | |||
| 23 | #undef __array | 20 | #undef __array |
| 24 | #define __array(type, item, len) type item[len]; | 21 | #define __array(type, item, len) type item[len]; |
| 25 | 22 | ||
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h index 8e398d864096..3ba55d4ab073 100644 --- a/kernel/trace/trace_events_stage_3.h +++ b/kernel/trace/trace_events_stage_3.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | * } | 35 | * } |
| 36 | * | 36 | * |
| 37 | * | 37 | * |
| 38 | * For those macros defined with TRACE_EVENT_FORMAT: | 38 | * For those macros defined with TRACE_EVENT: |
| 39 | * | 39 | * |
| 40 | * static struct ftrace_event_call event_<call>; | 40 | * static struct ftrace_event_call event_<call>; |
| 41 | * | 41 | * |
| @@ -144,10 +144,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ | |||
| 144 | .unregfunc = ftrace_unreg_event_##call, \ | 144 | .unregfunc = ftrace_unreg_event_##call, \ |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | #undef TRACE_EVENT_FORMAT | ||
| 148 | #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, raw) \ | ||
| 149 | TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt)) | ||
| 150 | |||
| 151 | #undef __entry | 147 | #undef __entry |
| 152 | #define __entry entry | 148 | #define __entry entry |
| 153 | 149 | ||
