Commit-ID: 157587d7ac555458da9f682e3250135e468470a6
Gitweb: http://git.kernel.org/tip/157587d7ac555458da9f682e3250135e468470a6
Author: "Steven Rostedt" <srostedt@xxxxxxxxxx>
AuthorDate: Tue, 10 Mar 2009 00:15:34 -0400
Commit: Steven Rostedt <srostedt@xxxxxxxxxx>
CommitDate: Tue, 10 Mar 2009 00:35:12 -0400
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@xxxxxxxxxx>
---
include/linux/tracepoint.h | 3 ---
include/trace/lockdep_event_types.h | 2 +-
include/trace/sched_event_types.h | 2 +-
kernel/trace/trace_events_stage_1.h | 3 ---
kernel/trace/trace_events_stage_3.h | 6 +-----
5 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 6b4f1bb..69b5698 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -157,9 +157,6 @@ static inline void tracepoint_synchronize_unregister(void)
#define TRACE_FORMAT(name, proto, args, fmt) \
DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
-#define TRACE_EVENT_FORMAT(name, proto, args, fmt, struct, tpfmt) \
- TRACE_FORMAT(name, PARAMS(proto), PARAMS(args), PARAMS(fmt))
-
#define TRACE_EVENT(name, proto, args, struct, print, assign) \
DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
diff --git a/include/trace/lockdep_event_types.h b/include/trace/lockdep_event_types.h
index 1f00e8b..adccfcd 100644
--- a/include/trace/lockdep_event_types.h
+++ b/include/trace/lockdep_event_types.h
@@ -1,5 +1,5 @@
-#ifndef TRACE_EVENT_FORMAT
+#ifndef TRACE_FORMAT
# error Do not include this file directly.
# error Unless you know what you are doing.
#endif
diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
index 0bbbf41..fb37af6 100644
--- a/include/trace/sched_event_types.h
+++ b/include/trace/sched_event_types.h
@@ -1,6 +1,6 @@
/* use <trace/sched.h> instead */
-#ifndef TRACE_EVENT_FORMAT
+#ifndef TRACE_EVENT
# error Do not include this file directly.
# error Unless you know what you are doing.
#endif
diff --git a/kernel/trace/trace_events_stage_1.h b/kernel/trace/trace_events_stage_1.h
index edfcbd3..15e9bf9 100644
--- a/kernel/trace/trace_events_stage_1.h
+++ b/kernel/trace/trace_events_stage_1.h
@@ -17,9 +17,6 @@
#undef TRACE_FORMAT
#define TRACE_FORMAT(call, proto, args, fmt)
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(name, proto, args, fmt, tstruct, tpfmt)
-
#undef __array
#define __array(type, item, len) type item[len];
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index 8e398d8..3ba55d4 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -35,7 +35,7 @@
* }
*
*
- * For those macros defined with TRACE_EVENT_FORMAT:
+ * For those macros defined with TRACE_EVENT:
*
* static struct ftrace_event_call event_<call>;
*
@@ -144,10 +144,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \
.unregfunc = ftrace_unreg_event_##call, \
}
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, raw) \
- TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt))
-
#undef __entry
#define __entry entry
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|