lkml.org 
[lkml]   [2009]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 7/8] tracing/events: fix the include file dependencies
    From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>

    The TRACE_EVENT depends on the include/linux/tracepoint.h first
    and include/trace/ftrace.h later, if we include the ftrace.h early,
    a building error will occur.

    Both define TRACE_EVENT in trace_a.h and trace_b.h, if we include
    those in .c file, like this:

    #define CREATE_TRACE_POINTS
    include <trace/events/trace_a.h>
    include <trace/events/trace_b.h>

    The above will not work, because the TRACE_EVENT was re-defined by
    the previous .h file.

    Reported-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    LKML-Reference: <4A937F5E.3020802@cn.fujitsu.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    include/linux/tracepoint.h | 3 +--
    include/trace/define_trace.h | 1 +
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
    index 5984ed0..8170985 100644
    --- a/include/linux/tracepoint.h
    +++ b/include/linux/tracepoint.h
    @@ -180,6 +180,7 @@ static inline void tracepoint_synchronize_unregister(void)
    }

    #define PARAMS(args...) args
    +#endif

    #ifndef TRACE_EVENT
    /*
    @@ -287,5 +288,3 @@ static inline void tracepoint_synchronize_unregister(void)
    #define TRACE_EVENT(name, proto, args, struct, assign, print) \
    DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
    #endif
    -
    -#endif
    diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
    index f7a7ae1..cd150b9 100644
    --- a/include/trace/define_trace.h
    +++ b/include/trace/define_trace.h
    @@ -56,6 +56,7 @@
    #include <trace/ftrace.h>
    #endif

    +#undef TRACE_EVENT
    #undef TRACE_HEADER_MULTI_READ

    /* Only undef what we defined in this file */
    --
    1.6.3.3
    --


    \
     
     \ /
      Last update: 2009-08-26 07:03    [W:0.023 / U:88.144 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site