summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-04-24 11:50:39 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-04-24 11:50:39 -0400
commitb8e65554d80b4c560d201362d0e8fa02109d89fd (patch)
tree21ebf291cf1ac97533cac99619652cd21bbd04f2 /include/trace
parent160031b556e93590fa8635210d73d93c3d3853a9 (diff)
downloadlinux-3.10-b8e65554d80b4c560d201362d0e8fa02109d89fd.tar.gz
linux-3.10-b8e65554d80b4c560d201362d0e8fa02109d89fd.tar.bz2
linux-3.10-b8e65554d80b4c560d201362d0e8fa02109d89fd.zip
tracing: remove deprecated TRACE_FORMAT
The TRACE_FORMAT macro has been deprecated by the TRACE_EVENT macro. There are no more users. All new users must use the TRACE_EVENT macro. [ Impact: remove old functionality ] Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/define_trace.h4
-rw-r--r--include/trace/ftrace.h66
2 files changed, 0 insertions, 70 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index abc611feeb8..f7a7ae1e8f9 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -26,10 +26,6 @@
#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
DEFINE_TRACE(name)
-#undef TRACE_FORMAT
-#define TRACE_FORMAT(name, proto, args, print) \
- DEFINE_TRACE(name)
-
#undef DECLARE_TRACE
#define DECLARE_TRACE(name, proto, args) \
DEFINE_TRACE(name)
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index a77f71a46db..1e681142f1d 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -18,9 +18,6 @@
#include <linux/ftrace_event.h>
-#undef TRACE_FORMAT
-#define TRACE_FORMAT(call, proto, args, fmt)
-
#undef __array
#define __array(type, item, len) type item[len];
@@ -62,9 +59,6 @@
*
*/
-#undef TRACE_FORMAT
-#define TRACE_FORMAT(call, proto, args, fmt)
-
#undef __array
#define __array(type, item, len)
@@ -298,16 +292,6 @@ ftrace_define_fields_##call(void) \
* unregister_trace_<call>(ftrace_event_<call>);
* }
*
- * For those macros defined with TRACE_FORMAT:
- *
- * static struct ftrace_event_call __used
- * __attribute__((__aligned__(4)))
- * __attribute__((section("_ftrace_events"))) event_<call> = {
- * .name = "<call>",
- * .regfunc = ftrace_reg_event_<call>,
- * .unregfunc = ftrace_unreg_event_<call>,
- * }
- *
*
* For those macros defined with TRACE_EVENT:
*
@@ -417,56 +401,6 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *call) \
#define _TRACE_PROFILE_INIT(call)
#endif
-#define _TRACE_FORMAT(call, proto, args, fmt) \
-static void ftrace_event_##call(proto) \
-{ \
- event_trace_printk(_RET_IP_, #call ": " fmt); \
-} \
- \
-static int ftrace_reg_event_##call(void) \
-{ \
- int ret; \
- \
- ret = register_trace_##call(ftrace_event_##call); \
- if (ret) \
- pr_info("event trace: Could not activate trace point " \
- "probe to " #call "\n"); \
- return ret; \
-} \
- \
-static void ftrace_unreg_event_##call(void) \
-{ \
- unregister_trace_##call(ftrace_event_##call); \
-} \
- \
-static struct ftrace_event_call event_##call; \
- \
-static int ftrace_init_event_##call(void) \
-{ \
- int id; \
- \
- id = register_ftrace_event(NULL); \
- if (!id) \
- return -ENODEV; \
- event_##call.id = id; \
- return 0; \
-}
-
-#undef TRACE_FORMAT
-#define TRACE_FORMAT(call, proto, args, fmt) \
-_TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt)) \
-_TRACE_PROFILE(call, PARAMS(proto), PARAMS(args)) \
-static struct ftrace_event_call __used \
-__attribute__((__aligned__(4))) \
-__attribute__((section("_ftrace_events"))) event_##call = { \
- .name = #call, \
- .system = __stringify(TRACE_SYSTEM), \
- .raw_init = ftrace_init_event_##call, \
- .regfunc = ftrace_reg_event_##call, \
- .unregfunc = ftrace_unreg_event_##call, \
- _TRACE_PROFILE_INIT(call) \
-}
-
#undef __entry
#define __entry entry