diff options
| author |   Will Deacon <will@kernel.org> | 2019-11-07 14:46:59 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-07-21 10:50:37 +0100 |
| commit | c6cd2e011655aead2097273a04350f52429a1a8d (patch) | |
| tree | f80d4f5a8a266a1e12b87ed1d95b07a5db5a965b /include | |
| parent | tools/memory-model: Remove smp_read_barrier_depends() from informal doc (diff) | |
| download | linux-dev-c6cd2e011655aead2097273a04350f52429a1a8d.tar.xz linux-dev-c6cd2e011655aead2097273a04350f52429a1a8d.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/percpu-refcount.h | 2 | ||||
| -rw-r--r-- | include/linux/ptr_ring.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h index 22d9d183950d..87d8a38bdea1 100644 --- 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 417db0a79a62..808f9d3ee546 100644 --- 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); |