X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Flttng-tracepoint-event.h;h=46d8b93374304e451f893a8c76a318cf55713bbe;hb=d4419b81b243bc3a6bdd4a09b3ca2216d044a1c7;hp=6772cfd180f12a09b34041b14dfda1c07681cb91;hpb=b8b77c004888c12e73e5e26e9ceffa68057f8f06;p=lttng-ust.git

diff --git a/include/ust/lttng-tracepoint-event.h b/include/ust/lttng-tracepoint-event.h
index 6772cfd1..46d8b933 100644
--- a/include/ust/lttng-tracepoint-event.h
+++ b/include/ust/lttng-tracepoint-event.h
@@ -441,7 +441,7 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 {									      \
 	struct ltt_event *__event = __data;				      \
 	struct ltt_channel *__chan = __event->chan;			      \
-	struct lib_ring_buffer_ctx __ctx;				      \
+	struct lttng_ust_lib_ring_buffer_ctx __ctx;				      \
 	size_t __event_len, __event_align;				      \
 	size_t __dynamic_len_idx = 0;					      \
 	size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_name)];	      \
@@ -449,11 +449,11 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 									      \
 	if (0)								      \
 		(void) __dynamic_len_idx;	/* don't warn if unused */    \
-	if (unlikely(!CMM_ACCESS_ONCE(__chan->session->active)))	      \
+	if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->session->active)))	      \
 		return;							      \
-	if (unlikely(!CMM_ACCESS_ONCE(__chan->enabled)))		      \
+	if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->enabled)))		      \
 		return;							      \
-	if (unlikely(!CMM_ACCESS_ONCE(__event->enabled)))		      \
+	if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled)))		      \
 		return;							      \
 	__event_len = __event_get_size__##_name(__dynamic_len, _args);	      \
 	__event_align = __event_get_align__##_name(_args);		      \
@@ -472,15 +472,15 @@ static void __event_probe__##_name(void *__data)			      \
 {									      \
 	struct ltt_event *__event = __data;				      \
 	struct ltt_channel *__chan = __event->chan;			      \
-	struct lib_ring_buffer_ctx __ctx;				      \
+	struct lttng_ust_lib_ring_buffer_ctx __ctx;				      \
 	size_t __event_len, __event_align;				      \
 	int __ret;							      \
 									      \
-	if (unlikely(!CMM_ACCESS_ONCE(__chan->session->active)))	      \
+	if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->session->active)))	      \
 		return;							      \
-	if (unlikely(!CMM_ACCESS_ONCE(__chan->enabled)))		      \
+	if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->enabled)))		      \
 		return;							      \
-	if (unlikely(!CMM_ACCESS_ONCE(__event->enabled)))		      \
+	if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled)))		      \
 		return;							      \
 	__event_len = 0;						      \
 	__event_align = 1;						      \