From b8ad9b2343a3528f6a90a92a497d86322ad846fd Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Fri, 28 Aug 2009 00:50:06 +0200 Subject: [PATCH] --- yaml --- r: 158472 b: refs/heads/master c: 0dd7b74787eaf7858c6c573353a83c3e2766e674 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/ftrace.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8824df06c2d5..146c5e6ca0b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66c6e29f24a50173fc1e761c3e2483c8d64e3b1a +refs/heads/master: 0dd7b74787eaf7858c6c573353a83c3e2766e674 diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index 360a77ad79e1..57c56a998ee6 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -45,14 +45,15 @@ }; \ static struct ftrace_event_call event_##name +#undef __cpparg +#define __cpparg(arg...) arg + /* Callbacks are meaningless to ftrace. */ #undef TRACE_EVENT_FN -#define TRACE_EVENT_FN(name, proto, args, tstruct, \ - assign, print, reg, unreg) \ - TRACE_EVENT(name, TP_PROTO(proto), TP_ARGS(args), \ - TP_STRUCT__entry(tstruct), \ - TP_fast_assign(assign), \ - TP_printk(print)) +#define TRACE_EVENT_FN(name, proto, args, tstruct, \ + assign, print, reg, unreg) \ + TRACE_EVENT(name, __cpparg(proto), __cpparg(args), \ + __cpparg(tstruct), __cpparg(assign), __cpparg(print)) \ #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)