Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1376983

[PATCH memory-barriers.txt 2/7] documentation: Fix missed renaming: s/lock/acquire

Show all headers | View raw

From: SeongJae Park <sj38.park@gmail.com>

Terms `lock` and `unlock` have changed to `acquire` / `release` by
commit 2e4f5382d12a441b5cccfdde00308df15c2ce300 ("locking/doc: Rename
LOCK/UNLOCK to ACQUIRE/RELEASE").  However, the commit missed to change
the table of content.  This commit changes the missed parts.
Also, section name `Acquiring functions` is not appropriate for the
section because the section is saying about lock in actual.  This commit
changes the name to more appropriate name, `Lock acquisition functions`.

Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Suggested-by: David Howells <dhowells@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
 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 ec1289042396..38b1ce161afb 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:
 
-- 
2.5.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH memory-barriers.txt 2/7] documentation: Fix missed renaming: s/lock/acquire "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-04-12 18:00 +0200
  [tip:locking/core] locking/Documentation: Fix missed s/lock/acquire  renames tip-bot for SeongJae Park <tipbot@zytor.com> - 2016-04-13 09:30 +0200
  Re: [PATCH memory-barriers.txt 2/7] documentation: Fix missed  renaming: s/lock/acquire Peter Zijlstra <peterz@infradead.org> - 2016-04-13 14:50 +0200
    Re: [PATCH memory-barriers.txt 2/7] documentation: Fix missed  renaming: s/lock/acquire "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-04-13 17:20 +0200

csiph-web