Commit-ID: 166bda7122c8e817f039bf738cf05ab3b7278732
Gitweb: http://git.kernel.org/tip/166bda7122c8e817f039bf738cf05ab3b7278732
Author: SeongJae Park <sj38.park@xxxxxxxxx>
AuthorDate: Tue, 12 Apr 2016 08:52:50 -0700
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
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 <dhowells@xxxxxxxxxx>
Signed-off-by: SeongJae Park <sj38.park@xxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: bobby.prani@xxxxxxxxx
Cc: dipankar@xxxxxxxxxx
Cc: dvhart@xxxxxxxxxxxxxxx
Cc: edumazet@xxxxxxxxxx
Cc: fweisbec@xxxxxxxxx
Cc: jiangshanlai@xxxxxxxxx
Cc: josh@xxxxxxxxxxxxxxxx
Cc: mathieu.desnoyers@xxxxxxxxxxxx
Cc: oleg@xxxxxxxxxx
Cc: rostedt@xxxxxxxxxxx
Link: http://lkml.kernel.org/r/1460476375-27803-2-git-send-email-paulmck@xxxxxxxxxxxxxxxxxx
[ Rewrote the changelog. ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
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:
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|