On Tue, Jul 10, 2018 at 12:02:23PM +0200, Andrea Parri wrote: > Amend commit 1f03e8d2919270 ("locking/barriers: Replace smp_cond_acquire() > with smp_cond_load_acquire()") by updating the documentation accordingly. > > Signed-off-by: Andrea Parri <andrea.parri@xxxxxxxxxxxxxxxxxxxx> > Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > Cc: Will Deacon <will.deacon@xxxxxxx> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Cc: Boqun Feng <boqun.feng@xxxxxxxxx> > Cc: Nicholas Piggin <npiggin@xxxxxxxxx> > Cc: David Howells <dhowells@xxxxxxxxxx> > Cc: Jade Alglave <j.alglave@xxxxxxxxx> > Cc: Luc Maranget <luc.maranget@xxxxxxxx> > Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx> > Cc: Akira Yokosawa <akiyks@xxxxxxxxx> > Cc: Daniel Lustig <dlustig@xxxxxxxxxx> > Cc: Jonathan Corbet <corbet@xxxxxxx> > --- > Documentation/memory-barriers.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt > index 0d8d7ef131e9a..987a4e6cc0cd8 100644 > --- a/Documentation/memory-barriers.txt > +++ b/Documentation/memory-barriers.txt > @@ -471,8 +471,8 @@ And a couple of implicit varieties: > operations after the ACQUIRE operation will appear to happen after the > ACQUIRE operation with respect to the other components of the system. > ACQUIRE operations include LOCK operations and both smp_load_acquire() > - and smp_cond_acquire() operations. The later builds the necessary ACQUIRE > - semantics from relying on a control dependency and smp_rmb(). > + and smp_cond_load_acquire() operations. The later builds the necessary > + ACQUIRE semantics from relying on a control dependency and smp_rmb(). Still not completely accurate: smp_rmb() would better be replaced by smp_acquire__after_ctrl_dep() (arm64 excluded). Mmh... I think I'll just remove that "The latter builds the [...]" and resend; thoughts? Andrea > > Memory operations that occur before an ACQUIRE operation may appear to > happen after it completes. > -- > 2.7.4 >