X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=2e0a79fd02d6cf88363252393a4f13011eedfb78;hb=4d3b06fe77725f267b85502dbeb51991296b9389;hp=918837e1a162b553091441bf8e0cd02d2015f89c;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 918837e1..2e0a79fd 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -31,12 +31,9 @@
 #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),	     \
-			tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
-		(_________p1);						     \
-	})
+#define tp_rcu_dereference_bp(p)					   \
+		URCU_FORCE_CAST(__typeof__(p),				   \
+			tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p)))
 
 #define TP_RCU_LINK_TEST()	tp_rcu_read_lock_bp