X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=dfc98ceeff8c4bc5044b35c771ef31043c985b92;hb=b670e9e80fd344432cb56e3c168b60103acd77d0;hp=01ad89daeaa8fca52ea0093a331c9c7c11eaa5af;hpb=8936b6c0add7eb6706e0a1ca50e03c446dda4006;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 01ad89da..dfc98cee 100644
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -78,8 +78,7 @@ static DEFINE_URCU_TLS(private_ctx_stack_t, private_ctx_stack);
 /*
  * Force a read (imply TLS fixup for dlopen) of TLS variables.
  */
-static
-void lttng_fixup_rb_client_tls(void)
+void RING_BUFFER_MODE_TEMPLATE_TLS_FIXUP(void)
 {
 	asm volatile ("" : : "m" (URCU_TLS(private_ctx_stack)));
 }
@@ -732,7 +731,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx)
 	if (nesting < 0)
 		return -EPERM;
 
-	private_ctx = &private_ctx_stack[nesting];
+	private_ctx = &URCU_TLS(private_ctx_stack)[nesting];
 	memset(private_ctx, 0, sizeof(*private_ctx));
 	private_ctx->pub = ctx;
 	private_ctx->chan = lttng_chan->priv->rb_chan;
@@ -858,7 +857,6 @@ void RING_BUFFER_MODE_TEMPLATE_INIT(void)
 {
 	DBG("LTT : ltt ring buffer client \"%s\" init\n",
 		"relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap");
-	lttng_fixup_rb_client_tls();
 	lttng_transport_register(&lttng_relay_transport);
 }