---

yaml --- r: 158456 b: refs/heads/master c: 5ac35da h: refs/heads/master v: v3
git-mirror · Aug 26, 2009 · 24dc666 · 24dc666
1 parent 546be81
commit 24dc666
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5079f3261ffd7fe4a537679af695f2328943a245
+refs/heads/master: 5ac35daa9343936038a3c9c4f4d6d3fe6a2a7bd8
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
@@ -180,6 +180,7 @@ static inline void tracepoint_synchronize_unregister(void)
 }
 
 #define PARAMS(args...) args
+#endif
 
 #ifndef TRACE_EVENT
 /*
@@ -287,5 +288,3 @@ 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
diff --git a/trunk/include/trace/define_trace.h b/trunk/include/trace/define_trace.h
@@ -56,6 +56,7 @@
 #include <trace/ftrace.h>
 #endif
 
+#undef TRACE_EVENT
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */