fix: removal of [smp_]read_barrier_depends (v5.9)

[lttng-modules.git] / include / ringbuffer / frontend.h

diff --git a/include/ringbuffer/frontend.h b/include/ringbuffer/frontend.h
index 41fec2a0959dc7a5159e181de96eb7f27363b581..1707d7133ca986a92aaa8b228a27b762ce522fac 100644 (file)
--- 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.
         */