aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 03:48:44 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-26 03:48:44 +0100
commitf4abfb8d0da70e436013e5799338357e1e6a0832 (patch)
tree55f087b8e29f64694de84afa09563ad2c0acdd42 /include/linux
parente36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c (diff)
parent3cdfdf91fcc77cfc82592e2b5c2ab35abe819c41 (diff)
Merge branch 'tip/tracing/ftrace' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tracepoint.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 34ae464efff..62d13391a24 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -153,7 +153,8 @@ static inline void tracepoint_synchronize_unregister(void)
synchronize_sched();
}
-#define DEFINE_TRACE_FMT(name, proto, args, fmt) \
- DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))
+#define PARAMS(args...) args
+#define TRACE_FORMAT(name, proto, args, fmt) \
+ DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
#endif