X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Fcommon%2Flttng_ust_context.c;h=e9b6da282db3bfbc5ec075a8ea64178c6f9ef851;hb=9b3a9a1f8ee47787e50a130b444dae38eee5dca0;hp=f412cc18fcb6c1b2eb33efe4526f78425401de55;hpb=b1ca4c5fae8a541330c940c45dd5f3bd93dbf46a;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
index f412cc18..e9b6da28 100644
--- a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
+++ b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
@@ -24,6 +24,7 @@
 #include <lttng/ust-events.h>
 #include <lttng/ringbuffer-config.h>
 #include <lttng/ust-context-provider.h>
+#include <urcu/tls-compat.h>
 
 #include "helper.h"
 #include "lttng_ust_context.h"
@@ -56,7 +57,7 @@ struct lttng_ust_jni_ctx_entry {
 } __attribute__((packed));
 
 /* TLS passing context info from JNI to callbacks. */
-__thread struct lttng_ust_jni_tls lttng_ust_context_info_tls;
+DECLARE_URCU_TLS_IE(struct lttng_ust_jni_tls, lttng_ust_context_info_tls);
 
 static const char *get_ctx_string_at_offset(int32_t offset)
 {
@@ -374,7 +375,7 @@ JNIEXPORT jlong JNICALL Java_org_lttng_ust_agent_context_LttngContextApi_registe
 		goto error_register;
 	}
 
-	provider_ref = (jlong) provider;
+	provider_ref = (jlong) (long) provider;
 	return provider_ref;
 
 	/* Error handling. */