X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=7762da7291ae5d1f215ee0c47039bd8c84f78d28;hb=8c90a710949a214d87084ff67fc85f284bc93ef2;hp=6f94040e9b186ca9a2788c3875d9d453bddde8c6;hpb=6715d7d1c61b3ffdae9d50aa8875c627900a857f;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 6f94040e..7762da72 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -58,6 +58,7 @@
 #include <fcntl.h>
 #include <urcu/compiler.h>
 #include <urcu/ref.h>
+#include <urcu/tls-compat.h>
 #include <helper.h>
 
 #include "smp.h"
@@ -102,7 +103,7 @@ struct switch_offsets {
 		     switch_old_end:1;
 };
 
-__thread unsigned int lib_ring_buffer_nesting;
+DEFINE_URCU_TLS(unsigned int, lib_ring_buffer_nesting);
 
 /*
  * TODO: this is unused. Errors are saved within the ring buffer.
@@ -1558,5 +1559,5 @@ int lib_ring_buffer_reserve_slow(struct lttng_ust_lib_ring_buffer_ctx *ctx)
  */
 void lttng_fixup_ringbuffer_tls(void)
 {
-	asm volatile ("" : : "m" (lib_ring_buffer_nesting));
+	asm volatile ("" : : "m" (URCU_TLS(lib_ring_buffer_nesting)));
 }