tracing: replace TP<var> with TP_<var>

[safe/jmp/linux-2.6] / include / linux / tracepoint.h

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 34ae464..3bcc3e1 100644 (file)
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -31,8 +31,8 @@ struct tracepoint {
                                         * Keep in sync with vmlinux.lds.h.
                                         */
 
-#define TPPROTO(args...)       args
-#define TPARGS(args...)                args
+#define TP_PROTO(args...)      args
+#define TP_ARGS(args...)               args
 
 #ifdef CONFIG_TRACEPOINTS
 
@@ -65,7 +65,7 @@ struct tracepoint {
        {                                                               \
                if (unlikely(__tracepoint_##name.state))                \
                        __DO_TRACE(&__tracepoint_##name,                \
-                               TPPROTO(proto), TPARGS(args));          \
+                               TP_PROTO(proto), TP_ARGS(args));        \
        }                                                               \
        static inline int register_trace_##name(void (*probe)(proto))   \
        {                                                               \
@@ -153,7 +153,11 @@ 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))
+
+#define TRACE_EVENT_FORMAT(name, proto, args, fmt, struct, tpfmt)      \
+       TRACE_FORMAT(name, PARAMS(proto), PARAMS(args), PARAMS(fmt))
 
 #endif