Commit-ID: 787df6383caa1338a4f6640d71917bc2d8c068b1 Gitweb: http://git.kernel.org/tip/787df6383caa1338a4f6640d71917bc2d8c068b1 Author: Davidlohr Bueso <d...@stgolabs.net> AuthorDate: Tue, 12 Apr 2016 08:52:55 -0700 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 13 Apr 2016 08:52:23 +0200
locking/Documentation: Mention smp_cond_acquire() ... do this next to smp_load_acquire() when first mentioning ACQUIRE. While this call is briefly explained and control dependencies are mentioned later, it does not hurt the reader. Signed-off-by: Davidlohr Bueso <dbu...@suse.de> Signed-off-by: Paul E. McKenney <paul...@linux.vnet.ibm.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Davidlohr Bueso <d...@stgolabs.net> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: bobby.pr...@gmail.com Cc: dhowe...@redhat.com Cc: dipan...@in.ibm.com Cc: dvh...@linux.intel.com Cc: eduma...@google.com Cc: fweis...@gmail.com Cc: jiangshan...@gmail.com Cc: j...@joshtriplett.org Cc: mathieu.desnoy...@efficios.com Cc: o...@redhat.com Cc: rost...@goodmis.org Link: http://lkml.kernel.org/r/1460476375-27803-7-git-send-email-paul...@linux.vnet.ibm.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- Documentation/memory-barriers.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 7133626..a9454b1 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt @@ -431,8 +431,9 @@ And a couple of implicit varieties: This acts as a one-way permeable barrier. It guarantees that all memory 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 smp_load_acquire() - operations. + 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(). Memory operations that occur before an ACQUIRE operation may appear to happen after it completes.
