]> Pileus Git - ~andy/linux/commit
tracing: fix cut and paste macro error
authorSteven Rostedt <srostedt@redhat.com>
Fri, 24 Apr 2009 03:26:18 +0000 (23:26 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 24 Apr 2009 03:34:20 +0000 (23:34 -0400)
commitc2518c4366f087ebc10b3919cb2461bbe4f42d0c
treea62093cb5d040a871a33d235f0993dc4b7fe27b9
parentd7285c6b5c54397fdf112c2fb98ee43193173aa9
tracing: fix cut and paste macro error

In case a module uses the TRACE_EVENT macro for creating automated
events in ftrace, it may choose to use a different file name
than the defined system name, or choose to use a different path than
the default "include/trace/events" include path.

If this is done, then before including trace/define_trace.h the
header would define either "TRACE_INCLUDE_FILE" for the file
name or "TRACE_INCLUDE_PATH" for the include path.

If it does not define these, then the define_trace.h defines them
instead. If define trace defines them, then define_trace.h should
also undefine them before exiting. To do this a macro is used
to note this:

 #ifndef TRACE_INCLUDE_FILE
 # define TRACE_INCLUDE_FILE TRACE_SYSTEM
 # define UNDEF_TRACE_INCLUDE_FILE
 #endif

[...]

 #ifdef UNDEF_TRACE_INCLUDE_FILE
 # undef TRACE_INCLUDE_FILE
 # undef UNDEF_TRACE_INCLUDE_FILE
 #endif

The UNDEF_TRACE_INCLUDE_FILE acts as a CPP variable to know to undef
the TRACE_INCLUDE_FILE before leaving define_trace.h.

Unfortunately, due to cut and paste errors, the macros between
FILE and PATH got mixed up.

[ Impact: undef TRACE_INCLUDE_FILE and/or TRACE_INCLUDE_PATH when needed ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
include/trace/define_trace.h