forked from Minki/linux
6c347d43ee
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>
83 lines
2.1 KiB
C
83 lines
2.1 KiB
C
/*
|
|
* Trace files that want to automate creationg of all tracepoints defined
|
|
* in their file should include this file. The following are macros that the
|
|
* trace file may define:
|
|
*
|
|
* TRACE_SYSTEM defines the system the tracepoint is for
|
|
*
|
|
* TRACE_INCLUDE_FILE if the file name is something other than TRACE_SYSTEM.h
|
|
* This macro may be defined to tell define_trace.h what file to include.
|
|
* Note, leave off the ".h".
|
|
*
|
|
* TRACE_INCLUDE_PATH if the path is something other than core kernel include/trace
|
|
* then this macro can define the path to use. Note, the path is relative to
|
|
* define_trace.h, not the file including it. Full path names for out of tree
|
|
* modules must be used.
|
|
*/
|
|
|
|
#ifdef CREATE_TRACE_POINTS
|
|
|
|
/* Prevent recursion */
|
|
#undef CREATE_TRACE_POINTS
|
|
|
|
#include <linux/stringify.h>
|
|
|
|
#undef TRACE_EVENT
|
|
#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
|
|
DEFINE_TRACE(name)
|
|
|
|
#undef TRACE_EVENT_FN
|
|
#define TRACE_EVENT_FN(name, proto, args, tstruct, \
|
|
assign, print, reg, unreg) \
|
|
DEFINE_TRACE_FN(name, reg, unreg)
|
|
|
|
#undef DECLARE_TRACE
|
|
#define DECLARE_TRACE(name, proto, args) \
|
|
DEFINE_TRACE(name)
|
|
|
|
#undef TRACE_INCLUDE
|
|
#undef __TRACE_INCLUDE
|
|
|
|
#ifndef TRACE_INCLUDE_FILE
|
|
# define TRACE_INCLUDE_FILE TRACE_SYSTEM
|
|
# define UNDEF_TRACE_INCLUDE_FILE
|
|
#endif
|
|
|
|
#ifndef TRACE_INCLUDE_PATH
|
|
# define __TRACE_INCLUDE(system) <trace/events/system.h>
|
|
# define UNDEF_TRACE_INCLUDE_PATH
|
|
#else
|
|
# define __TRACE_INCLUDE(system) __stringify(TRACE_INCLUDE_PATH/system.h)
|
|
#endif
|
|
|
|
# define TRACE_INCLUDE(system) __TRACE_INCLUDE(system)
|
|
|
|
/* Let the trace headers be reread */
|
|
#define TRACE_HEADER_MULTI_READ
|
|
|
|
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
|
|
|
|
#ifdef CONFIG_EVENT_TRACING
|
|
#include <trace/ftrace.h>
|
|
#endif
|
|
|
|
#undef TRACE_EVENT
|
|
#undef TRACE_EVENT_FN
|
|
#undef TRACE_HEADER_MULTI_READ
|
|
|
|
/* Only undef what we defined in this file */
|
|
#ifdef UNDEF_TRACE_INCLUDE_FILE
|
|
# undef TRACE_INCLUDE_FILE
|
|
# undef UNDEF_TRACE_INCLUDE_FILE
|
|
#endif
|
|
|
|
#ifdef UNDEF_TRACE_INCLUDE_PATH
|
|
# undef TRACE_INCLUDE_PATH
|
|
# undef UNDEF_TRACE_INCLUDE_PATH
|
|
#endif
|
|
|
|
/* We may be processing more files */
|
|
#define CREATE_TRACE_POINTS
|
|
|
|
#endif /* CREATE_TRACE_POINTS */
|