From b80200282d8297824af1e711a4c5ecd8c66e4d99 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Tue, 20 Jul 2010 18:41:24 +0200 Subject: [PATCH] --- yaml --- r: 205350 b: refs/heads/master c: 819ce45afebd77a9de736fa5304ba8352d11dff9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/ftrace.h | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 71ca18e279f1..abf6a13da57a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 669336e4cf3e1cb95800f3f5924558a76d723c21 +refs/heads/master: 819ce45afebd77a9de736fa5304ba8352d11dff9 diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index fb783d94fc54..a9377c0083ad 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -75,15 +75,12 @@ #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) -#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, __cpparg(proto), __cpparg(args), \ - __cpparg(tstruct), __cpparg(assign), __cpparg(print)) \ + TRACE_EVENT(name, PARAMS(proto), PARAMS(args), \ + PARAMS(tstruct), PARAMS(assign), PARAMS(print)) \ #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)