diff --git a/[refs] b/[refs] index 5cece8c96e70..9933d6d65495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eef62a6826b8ab530cefff5aa55c1661a209c803 +refs/heads/master: 3cdfdf91fcc77cfc82592e2b5c2ab35abe819c41 diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h index 3de09fa8e01d..62d13391a240 100644 --- a/trunk/include/linux/tracepoint.h +++ b/trunk/include/linux/tracepoint.h @@ -153,7 +153,8 @@ static inline void tracepoint_synchronize_unregister(void) synchronize_sched(); } +#define PARAMS(args...) args #define TRACE_FORMAT(name, proto, args, fmt) \ - DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args)) + DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) #endif