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 a2d115b19c52eb0ebc40a754b80c3a5cd5bbb853..8776ce4577c83e9c0f72b6dbbe98eb6a940451c9 100644 (file)
--- 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 5e7f9d86967580fd314ca1b21621e678ff585f85..ade567726e9c4cffeffc5e0c39d61a8b66927a35 100644 (file)
--- 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)