From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 15 Apr 2021 19:39:59 +0000 (-0400)
Subject: Namespace tracepoint probes init/exit under lttng_ust_
X-Git-Tag: v2.13.0-rc1~103
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9c9c1ece01b64bdba98077d5aa78174820d2277c;p=lttng-ust.git

Namespace tracepoint probes init/exit under lttng_ust_

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: If487b517c5691cde3ae773b0902d8f08050fc6c1
---

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 3408cb92..408e2a2b 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -1112,10 +1112,10 @@ static struct lttng_ust_registered_probe *_TP_COMBINE_TOKENS(__lttng_ust_probe_r
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 static void
-_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
+_TP_COMBINE_TOKENS(__lttng_ust_events_init__, TRACEPOINT_PROVIDER)(void)
 	lttng_ust_notrace __attribute__((constructor));
 static void
-_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
+_TP_COMBINE_TOKENS(__lttng_ust_events_init__, TRACEPOINT_PROVIDER)(void)
 {
 	struct lttng_ust_registered_probe *reg_probe;
 
@@ -1142,10 +1142,10 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
 }
 
 static void
-_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
+_TP_COMBINE_TOKENS(__lttng_ust_events_exit__, TRACEPOINT_PROVIDER)(void)
 	lttng_ust_notrace __attribute__((destructor));
 static void
-_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
+_TP_COMBINE_TOKENS(__lttng_ust_events_exit__, TRACEPOINT_PROVIDER)(void)
 {
 	if (--_TP_COMBINE_TOKENS(__probe_register_refcount___,
 			TRACEPOINT_PROVIDER)) {