include/linux: Remove smp_read_barrier_depends() from comments

smp_read_barrier_depends() doesn't exist any more, so reword the two
comments that mention it to refer to "dependency ordering" instead.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
index 22d9d183950dc2e17beca9debd89d665cd08b7b6..87d8a38bdea19e92304639ce1c6445158533080d 100644 (file)
--- a/include/linux/percpu-refcount.h
+++ b/include/linux/percpu-refcount.h
@@ -155,7 +155,7 @@ static inline bool __ref_is_percpu(struct percpu_ref *ref,
         * between contaminating the pointer value, meaning that
         * READ_ONCE() is required when fetching it.
         *
-        * The smp_read_barrier_depends() implied by READ_ONCE() pairs
+        * The dependency ordering from the READ_ONCE() pairs
         * with smp_store_release() in __percpu_ref_switch_to_percpu().
         */
        percpu_ptr = READ_ONCE(ref->percpu_count_ptr);

diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
index 417db0a79a629163bcf1937520f1efca5256d797..808f9d3ee54654a0db3acdacb0426eba1f4917ec 100644 (file)
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
@@ -107,7 +107,7 @@ static inline int __ptr_ring_produce(struct ptr_ring *r, void *ptr)
                return -ENOSPC;
 
        /* Make sure the pointer we are storing points to a valid data. */
-       /* Pairs with smp_read_barrier_depends in __ptr_ring_consume. */
+       /* Pairs with the dependency ordering in __ptr_ring_consume. */
        smp_wmb();
 
        WRITE_ONCE(r->queue[r->producer++], ptr);