X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=3951f5b0fa3111283b71b7021fc67a9f16f5ee73;hb=a9fd951a21f28704ffdfd4217766f725a217208b;hp=48955795a837bce30f88478ec9f0edd14a0806eb;hpb=cbc06a3bd9abe653eaf278cdf4be8bf28dcca267;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c b/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c
index 48955795..3951f5b0 100644
--- a/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -30,9 +30,12 @@
 #include "common/macros.h"
 #include "common/align.h"
 
-#define TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
-#define TP_IP_PARAM ip
+#define LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION
+
+#define LTTNG_UST_TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TP_IP_PARAM ip
 #include "ust_libc.h"
 
 #define STATIC_CALLOC_LEN 4096
@@ -423,7 +426,7 @@ int posix_memalign(void **memptr, size_t alignment, size_t size)
 }
 
 static
-void lttng_ust_fixup_malloc_nesting_tls(void)
+void lttng_ust_malloc_nesting_alloc_tls(void)
 {
 	asm volatile ("" : : "m" (URCU_TLS(malloc_nesting)));
 }
@@ -434,7 +437,7 @@ void lttng_ust_libc_wrapper_malloc_ctor(void)
 	if (cur_alloc.calloc) {
 		return;
 	}
-	lttng_ust_fixup_malloc_nesting_tls();
+	lttng_ust_malloc_nesting_alloc_tls();
 	/*
 	 * Ensure the allocator is in place before the process becomes
 	 * multithreaded.