From e65fb2f1694bb231e11f50a58a4f0af8c6937e93 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 26 Aug 2009 00:32:37 -0400
Subject: [PATCH] --- yaml --- r: 158457 b: refs/heads/master c:
 7cb2e3ee2aeec5b83ecadba929a2dc575dd4008f h: refs/heads/master i:   158455:
 546be81f9a5a0b40ff123aa2080a6bf811a010e6 v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/tracepoint.h | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 46d8d39a9d7c..9f8d89853771 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ac35daa9343936038a3c9c4f4d6d3fe6a2a7bd8
+refs/heads/master: 7cb2e3ee2aeec5b83ecadba929a2dc575dd4008f
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
index 81709854f7ab..0341f2e2698a 100644
--- a/trunk/include/linux/tracepoint.h
+++ b/trunk/include/linux/tracepoint.h
@@ -180,7 +180,15 @@ static inline void tracepoint_synchronize_unregister(void)
 }
 
 #define PARAMS(args...) args
-#endif
+
+#endif /* _LINUX_TRACEPOINT_H */
+
+/*
+ * Note: we keep the TRACE_EVENT outside the include file ifdef protection.
+ *  This is due to the way trace events work. If a file includes two
+ *  trace event headers under one "CREATE_TRACE_POINTS" the first include
+ *  will override the TRACE_EVENT and break the second include.
+ */
 
 #ifndef TRACE_EVENT
 /*
@@ -287,4 +295,5 @@ 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 /* ifdef TRACE_EVENT (see note above) */