-#define TRACEPOINT_LOGLEVEL(__provider, __name, __loglevel) \
-{ \
- .name = #__provider ":" #__name, \
- .loglevel = &_TP_COMBINE_TOKENS(_TP_COMBINE_TOKENS(TRACEPOINT_PROVIDER, __tp_loglevel_enum_entry__), __loglevel), \
-},
+#define TRACEPOINT_LOGLEVEL(__provider, __name, __loglevel) \
+static const struct tracepoint_loglevel_entry * \
+ _loglevel_mapping___##__provider##___##__name = \
+ &__tp_loglevel_entry__##__provider##___##__loglevel;
+
+#include TRACEPOINT_INCLUDE
+
+/*
+ * Stage 8.1 of tracepoint event generation.
+ *
+ * Create events description structures. We use a weakref because
+ * loglevels are optional. If not declared, the event will point to the
+ * a loglevel that contains NULL.
+ */
+
+/* Reset all macros within TRACEPOINT_EVENT */
+#include <lttng/ust-tracepoint-event-reset.h>
+
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
+static const struct tracepoint_loglevel_entry * \
+ __ref_loglevel_mapping___##_provider##___##_name \
+ __attribute__((weakref ("_loglevel_mapping___" #_provider "___" #_name))); \
+const struct lttng_event_desc __event_desc___##_provider##_##_name = { \
+ .fields = __event_fields___##_provider##___##_template, \
+ .name = #_provider ":" #_name, \
+ .probe_callback = (void *) &__event_probe__##_provider##___##_template,\
+ .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
+ .loglevel = &__ref_loglevel_mapping___##_provider##___##_name, \
+};
+
+#include TRACEPOINT_INCLUDE