X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=23dab7d6c9b47e9838e719d00a479dff315d4cfc;hb=2ae577586ce440e59acd37c0110b80a595a64d12;hp=852cfe48d55ee630d588a7ed64d822142e3c7561;hpb=40b2b5a43e4c2067849770b3379ca5360facacd5;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 852cfe48..23dab7d6 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -23,27 +23,25 @@
 
 #include <urcu-bp.h>
 
-#define TP_RCU_LINK_TEST()	1
 #define tp_rcu_read_lock_bp	rcu_read_lock_bp
 #define tp_rcu_read_unlock_bp	rcu_read_unlock_bp
 #define tp_rcu_dereference_bp	rcu_dereference_bp
+#define TP_RCU_LINK_TEST()	1
 
 #else	/* _LGPL_SOURCE */
 
-#define TP_RCU_LINK_TEST()     tp_rcu_read_lock_bp
-
-/* Symbols looked up with dlsym */
-static void (*tp_rcu_read_lock_bp)(void) __attribute__((unused));
-static void (*tp_rcu_read_unlock_bp)(void) __attribute__((unused));
-static void *(*tp_rcu_dereference_sym_bp)(void *p) __attribute__((unused));
+#define tp_rcu_read_lock_bp	tracepoint_dlopen.rcu_read_lock_sym_bp
+#define tp_rcu_read_unlock_bp	tracepoint_dlopen.rcu_read_unlock_sym_bp
 
 #define tp_rcu_dereference_bp(p)					     \
 	({								     \
 		typeof(p) _________p1 =	URCU_FORCE_CAST(typeof(p),	     \
-			tp_rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
+			tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
 		(_________p1);						     \
 	})
 
+#define TP_RCU_LINK_TEST()	tp_rcu_read_lock_bp
+
 #endif	/* _LGPL_SOURCE */
 
 #endif	/* _LTTNG_TRACEPOINT_RCU_H */