mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for SeongJae Park <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: sj38.park@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org,
	akpm@linux-foundation.org, tglx@linutronix.de,
	peterz@infradead.org, paulmck@linux.vnet.ibm.com,
	mingo@kernel.org, dhowells@redhat.com,
	torvalds@linux-foundation.org
Subject: [tip:locking/core] locking/Documentation: Fix missed s/lock/acquire renames
Date: Wed, 13 Apr 2016 00:28:12 -0700	[thread overview]
Message-ID: <tip-166bda7122c8e817f039bf738cf05ab3b7278732@git.kernel.org> (raw)
In-Reply-To: <1460476375-27803-2-git-send-email-paulmck@linux.vnet.ibm.com>

Commit-ID:  166bda7122c8e817f039bf738cf05ab3b7278732
Gitweb:     http://git.kernel.org/tip/166bda7122c8e817f039bf738cf05ab3b7278732
Author:     SeongJae Park <sj38.park@gmail.com>
AuthorDate: Tue, 12 Apr 2016 08:52:50 -0700
Committer:  Ingo Molnar <mingo@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 <dhowells@redhat.com>
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bobby.prani@gmail.com
Cc: dipankar@in.ibm.com
Cc: dvhart@linux.intel.com
Cc: edumazet@google.com
Cc: fweisbec@gmail.com
Cc: jiangshanlai@gmail.com
Cc: josh@joshtriplett.org
Cc: mathieu.desnoyers@efficios.com
Cc: oleg@redhat.com
Cc: rostedt@goodmis.org
Link: http://lkml.kernel.org/r/1460476375-27803-2-git-send-email-paulmck@linux.vnet.ibm.com
[ Rewrote the changelog. ]
Signed-off-by: Ingo Molnar <mingo@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:
 

  reply	other threads:[~2016-04-13  7:28 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-12 15:52 [PATCH memory-barriers.txt 0/7] Memory-model updates for 4.7 Paul E. McKenney
2016-04-12 15:52 ` [PATCH memory-barriers.txt 1/7] documentation: Clarify relationship of barrier() to control dependencies Paul E. McKenney
2016-04-13  7:27   ` [tip:locking/core] locking/Documentation: " tip-bot for Paul E. McKenney
2016-04-14  3:56   ` [PATCH memory-barriers.txt 1/7] documentation: " Steven Rostedt
2016-04-14 15:28     ` Paul E. McKenney
2016-04-12 15:52 ` [PATCH memory-barriers.txt 2/7] documentation: Fix missed renaming: s/lock/acquire Paul E. McKenney
2016-04-13  7:28   ` tip-bot for SeongJae Park [this message]
2016-04-13 12:46   ` Peter Zijlstra
2016-04-13 14:29     ` Paul E. McKenney
2016-04-12 15:52 ` [PATCH memory-barriers.txt 3/7] documentation: Add missed subsection in TOC Paul E. McKenney
2016-04-13  7:28   ` [tip:locking/core] locking/Documentation: " tip-bot for SeongJae Park
2016-04-12 15:52 ` [PATCH memory-barriers.txt 4/7] Documentation: Fix typo Paul E. McKenney
2016-04-13  7:29   ` [tip:locking/core] locking/Documentation: Fix formatting inconsistencies tip-bot for SeongJae Park
2016-04-12 15:52 ` [PATCH memory-barriers.txt 5/7] Documentation: Insert white spaces consistently Paul E. McKenney
2016-04-13  7:29   ` [tip:locking/core] locking/Documentation: " tip-bot for SeongJae Park
2016-04-12 15:52 ` [PATCH memory-barriers.txt 6/7] documentation: Add Korean translation Paul E. McKenney
2016-04-13  6:38   ` Ingo Molnar
2016-04-13  8:11     ` SeongJae Park
2016-04-13 12:49       ` Paul E. McKenney
2016-04-13 18:46         ` Jonathan Corbet
2016-04-13 19:09           ` Paul E. McKenney
2016-04-14  1:04         ` SeongJae Park
2016-04-14 15:25           ` Paul E. McKenney
2016-04-14 22:17             ` SeongJae Park
2016-04-15 23:23               ` Paul E. McKenney
2016-04-18  9:31                 ` SeongJae Park
2016-04-18 10:00                   ` [PATCH v2] Doc/memory-barriers: add " SeongJae Park
2016-04-18 20:33                   ` [PATCH memory-barriers.txt 6/7] documentation: Add " Paul E. McKenney
2016-04-12 15:52 ` [PATCH memory-barriers.txt 7/7] Documentation,barriers: Mention smp_cond_acquire() Paul E. McKenney
2016-04-13  7:29   ` [tip:locking/core] locking/Documentation: " tip-bot for Davidlohr Bueso
2016-04-13 12:53   ` [PATCH memory-barriers.txt 7/7] Documentation,barriers: " Peter Zijlstra
2016-04-13 14:17     ` Paul E. McKenney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-166bda7122c8e817f039bf738cf05ab3b7278732@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=akpm@linux-foundation.org \
    --cc=dhowells@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=peterz@infradead.org \
    --cc=sj38.park@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome