X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=9d757940d381a63b1ad8efd52562a893aa2de5b2;hb=020760b19e351bda940b38ca273f32206ab4d03f;hp=2cbe4475226be98ac917c1adb27d11ec88e5e326;hpb=8511626a5d7af3d9c447f64dd1ecd9e2ce22763a;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 2cbe4475..9d757940 100644
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -21,12 +21,14 @@ extern "C" {
 #define __tp_stringify(x)	__tp_stringify1(x)
 
 #undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)	\
-	_DEFINE_TRACEPOINT(provider, name)
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
 
 #undef TRACEPOINT_EVENT
 #define TRACEPOINT_EVENT(_provider, _name, _args, _fields)		\
-	TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name, _TP_PARAMS(_args))
+	TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args),	\
+			_TP_PARAMS(_fields))				\
+	TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name,		\
+			_TP_PARAMS(_args))
 
 #define TRACEPOINT_INCLUDE	__tp_stringify(TRACEPOINT_INCLUDE_FILE)
 
@@ -34,6 +36,9 @@ extern "C" {
 
 #define TRACEPOINT_HEADER_MULTI_READ
 #include TRACEPOINT_INCLUDE
+
+#include <lttng/ust-tracepoint-event.h>
+
 #undef TRACEPOINT_HEADER_MULTI_READ
 
 #define TRACEPOINT_CREATE_PROBES