Re: tracing: Multi definition of TRACE_INCLUDE_FILE

From: Wenji Huang
Date: Wed Jan 13 2010 - 21:52:22 EST


Hi Steven,

Steven Rostedt wrote:
On Wed, Jan 06, 2010 at 03:40:40PM +0800, Wenji Huang wrote:
Hi,

There are multi definition of TRACE_INCLUDE_FILE on
include/trace/events/{syscalls, kvm}.h
It will result in compilation error when some
out-of-tree tools like Systemtap processes kernel
tracepoints in a way to put header files into module.


Does the following patch fix your issues?


Yes, that could be.

Thanks,
wenji

-- Steve


diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index dbe1084..532d658 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -4,6 +4,7 @@
#include <linux/tracepoint.h>
#undef TRACE_SYSTEM
+#undef TRACE_INCLUDE_FILE
#define TRACE_SYSTEM kvm
#define TRACE_INCLUDE_FILE kvm
diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h
index fb726ac..52290bb 100644
--- a/include/trace/events/syscalls.h
+++ b/include/trace/events/syscalls.h
@@ -1,4 +1,5 @@
#undef TRACE_SYSTEM
+#undef TRACE_INCLUDE_FILE
#define TRACE_SYSTEM raw_syscalls
#define TRACE_INCLUDE_FILE syscalls

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/