Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux...

[safe/jmp/linux-2.6] / include / trace / define_trace.h

diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index abc611f..2a4b3bf 100644 (file)
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -26,9 +26,10 @@
 #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
        DEFINE_TRACE(name)
 
-#undef TRACE_FORMAT
-#define TRACE_FORMAT(name, proto, args, 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)       \
@@ -60,6 +61,8 @@
 #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 */