Commit-ID: 166bda7122c8e817f039bf738cf05ab3b7278732
Gitweb: http://git.kernel.org/tip/166bda7122c8e817f039bf738cf05ab3b7278732
Author: SeongJae Park <sj38.p...@gmail.com>
AuthorDate: Tue, 12 Apr 2016 08:52:50 -0700
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Wed, 13 Apr 2016 08:52:21 +0200
locking/Documentation: Fix missed s/lock/acquire renames
The terms 'lock'/'unlock' were changed to 'acquire'/'release' by the
following commit:
2e4f5382d12a4 ("locking/doc: Rename LOCK/UNLOCK to ACQUIRE/RELEASE")
However, the commit missed to change the table of contents - fix that.
Also, the dumb rename changed the section name 'Locking functions' to an
actively misleading 'Acquiring functions' section name.
Rename it to 'Lock acquisition functions' instead.
Suggested-by: David Howells <dhowe...@redhat.com>
Signed-off-by: SeongJae Park <sj38.p...@gmail.com>
Signed-off-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Cc: Andrew Morton <a...@linux-foundation.org>
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: 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-2-git-send-email-paul...@linux.vnet.ibm.com
[ Rewrote the changelog. ]
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
Documentation/memory-barriers.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/memory-barriers.txt
b/Documentation/memory-barriers.txt
index ec12890..38b1ce1 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -31,15 +31,15 @@ Contents:
(*) Implicit kernel memory barriers.
- - Locking functions.
+ - Lock acquisition functions.
- Interrupt disabling functions.
- Sleep and wake-up functions.
- Miscellaneous functions.
- (*) Inter-CPU locking barrier effects.
+ (*) Inter-CPU acquiring barrier effects.
- - Locks vs memory accesses.
- - Locks vs I/O accesses.
+ - Acquires vs memory accesses.
+ - Acquires vs I/O accesses.
(*) Where are memory barriers needed?
@@ -1859,7 +1859,7 @@ This is a variation on the mandatory write barrier that
causes writes to weakly
ordered I/O regions to be partially ordered. Its effects may go beyond the
CPU->Hardware interface and actually affect the hardware at some level.
-See the subsection "Locks vs I/O accesses" for more information.
+See the subsection "Acquires vs I/O accesses" for more information.
===============================
@@ -1874,8 +1874,8 @@ provide more substantial guarantees, but these may not be
relied upon outside
of arch specific code.
-ACQUIRING FUNCTIONS
--------------------
+LOCK ACQUISITION FUNCTIONS
+--------------------------
The Linux kernel has a number of locking constructs:
