From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 15 Dec 2011 22:10:50 +0000 (-0500)
Subject: Use caa_unlikely, depend on liburcu >= 0.6.6
X-Git-Tag: v0.16~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5296e06cffd5ed5dcf3bb9fe7e3a18744ac18823;p=ust.git

Use caa_unlikely, depend on liburcu >= 0.6.6

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/README b/README
index a2d115b..8776ce4 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ PREREQUISITES:
   - liburcu
     Userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney
 
-    -> This release depends on liburcu v0.6
+    -> This release depends on liburcu v0.6.6
 
       * Debian/Ubuntu package: liburcu-dev
       * Website:  http://lttng.org/urcu
diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index 5e7f9d8..ade5677 100644
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -27,6 +27,7 @@
 
 #include <urcu-bp.h>
 #include <urcu/list.h>
+#include <urcu/compiler.h>
 
 struct tracepoint_probe {
 	void *func;
@@ -96,7 +97,7 @@ struct tracepoint {
 
 #define __CHECK_TRACE(name, proto, args)				\
 	do {								\
-		if (unlikely(__tracepoint_##name.state))		\
+		if (caa_unlikely(__tracepoint_##name.state))		\
 			__DO_TRACE(&__tracepoint_##name,		\
 				TP_PROTO(proto), TP_ARGS(args));	\
 	} while (0)