diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-08-27 12:17:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-27 12:32:54 -0400 |
| commit | 6c347d43eea29221a8ebab9ff9cbe7a00cddac98 (patch) | |
| tree | e5afc2f493816fa1401a4ef4724167e3972cd209 | |
| parent | 35dce1a99d010f3d738af4ce1b9b77302fdfe69c (diff) | |
tracing: Undef TRACE_EVENT_FN between trace events headers inclusion
The recent commit:
tracing/events: fix the include file dependencies
fixed a file dependency problem while including more than
one trace event header file.
This fix undefined TRACE_EVENT after an event header macro
preprocessing in order to make tracepoint.h able to correctly declare
the tracepoints necessary for the next event header file.
But now we also need to undefine TRACE_EVENT_FN at the end of an event
header file preprocessing for the same reason.
This fixes the following build error:
In file included from include/trace/events/napi.h:5,
from net/core/net-traces.c:28:
include/linux/tracepoint.h:285:1: warning: "TRACE_EVENT_FN" redefined
In file included from include/trace/define_trace.h:61,
from include/trace/events/skb.h:40,
from net/core/net-traces.c:27:
include/trace/ftrace.h:50:1: warning: this is the location of the previous definition
In file included from include/trace/events/napi.h:5,
from net/core/net-traces.c:28:
include/linux/tracepoint.h:285:1: warning: "TRACE_EVENT_FN" redefined
In file included from include/trace/define_trace.h:61,
from include/trace/events/skb.h:40,
from net/core/net-traces.c:27:
include/trace/ftrace.h:50:1: warning: this is the location of the previous definition
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <20090827161732.GA7618@nowhere>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/trace/define_trace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index a89ed590597a..2a4b3bf74033 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h | |||
| @@ -62,6 +62,7 @@ | |||
| 62 | #endif | 62 | #endif |
| 63 | 63 | ||
| 64 | #undef TRACE_EVENT | 64 | #undef TRACE_EVENT |
| 65 | #undef TRACE_EVENT_FN | ||
| 65 | #undef TRACE_HEADER_MULTI_READ | 66 | #undef TRACE_HEADER_MULTI_READ |
| 66 | 67 | ||
| 67 | /* Only undef what we defined in this file */ | 68 | /* Only undef what we defined in this file */ |