X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=1815801a8fe08a06df22b6d1614efc969ca75b4d;hb=49365f4b706194cafe75d8b759554bf9de743c1d;hp=36f57efb25f4d97c31bcb04b7fd207f2807b9a8c;hpb=c993aa602df5d770ea1da811c4f7f643dde1ed34;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 36f57efb..1815801a 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -46,6 +46,7 @@
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "compat.h"
+#include "../libringbuffer/tlsfixup.h"
 
 /*
  * Has lttng ust comm constructor been called ?
@@ -827,6 +828,15 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	if (uatomic_xchg(&initialized, 1) == 1)
 		return;
 
+	/*
+	 * Fixup interdependency between TLS fixup mutex (which happens
+	 * to be the dynamic linker mutex) and ust_lock, taken within
+	 * the ust lock.
+	 */
+	lttng_fixup_event_tls();
+	lttng_fixup_ringbuffer_tls();
+	lttng_fixup_vtid_tls();
+
 	/*
 	 * We want precise control over the order in which we construct
 	 * our sub-libraries vs starting to receive commands from