aboutsummaryrefslogtreecommitdiff
path: root/include/linux/tracepoint.h
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2009-08-25 14:06:22 +0800
committerSteven Rostedt <rostedt@goodmis.org>2009-08-26 00:32:09 -0400
commit5ac35daa9343936038a3c9c4f4d6d3fe6a2a7bd8 (patch)
tree0810db04bd8ad675aee30681576903e393e9d4c6 /include/linux/tracepoint.h
parent5079f3261ffd7fe4a537679af695f2328943a245 (diff)
downloadlinux-linaro-stable-5ac35daa9343936038a3c9c4f4d6d3fe6a2a7bd8.tar.gz
tracing/events: fix the include file dependencies
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>
Diffstat (limited to 'include/linux/tracepoint.h')
-rw-r--r--include/linux/tracepoint.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 5984ed04c03b..81709854f7ab 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