From 5296e06cffd5ed5dcf3bb9fe7e3a18744ac18823 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 15 Dec 2011 17:10:50 -0500 Subject: [PATCH] Use caa_unlikely, depend on liburcu >= 0.6.6 Signed-off-by: Mathieu Desnoyers --- README | 2 +- include/ust/tracepoint.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 #include +#include 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) -- 2.34.1