X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=include%2Fringbuffer%2Ffrontend.h;h=1707d7133ca986a92aaa8b228a27b762ce522fac;hp=41fec2a0959dc7a5159e181de96eb7f27363b581;hb=585e5dcc4bf017c03b86dc84371f9c6170e12785;hpb=20e546d0894624fd82af092414d9a4927c7d6ea5

diff --git a/include/ringbuffer/frontend.h b/include/ringbuffer/frontend.h
index 41fec2a0..1707d713 100644
--- a/include/ringbuffer/frontend.h
+++ b/include/ringbuffer/frontend.h
@@ -79,7 +79,7 @@ void *channel_destroy(struct channel *chan);
 #define for_each_channel_cpu(cpu, chan)					\
 	for ((cpu) = -1;						\
 		({ (cpu) = cpumask_next(cpu, (chan)->backend.cpumask);	\
-		   smp_read_barrier_depends(); (cpu) < nr_cpu_ids; });)
+		   smp_rmb(); (cpu) < nr_cpu_ids; });)
 
 extern struct lib_ring_buffer *channel_get_ring_buffer(
 				const struct lib_ring_buffer_config *config,
@@ -155,7 +155,7 @@ static inline
 int lib_ring_buffer_is_finalized(const struct lib_ring_buffer_config *config,
 				 struct lib_ring_buffer *buf)
 {
-	int finalized = READ_ONCE(buf->finalized);
+	int finalized = LTTNG_READ_ONCE(buf->finalized);
 	/*
 	 * Read finalized before counters.
 	 */