From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752713AbcCJPHK (ORCPT ); Thu, 10 Mar 2016 10:07:10 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34009 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752383AbcCJPGx (ORCPT ); Thu, 10 Mar 2016 10:06:53 -0500 From: SeongJae Park To: paulmck@linux.vnet.ibm.com Cc: dhowells@redhat.com, corbet@lwn.net, minchan@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, SeongJae Park Subject: [PATCH v2 1/5] doc/memory-barriers: fix missed renaming: s/lock/acquire Date: Fri, 11 Mar 2016 00:06:56 +0900 Message-Id: <1457622420-25591-2-git-send-email-sj38.park@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457622420-25591-1-git-send-email-sj38.park@gmail.com> References: <1457622420-25591-1-git-send-email-sj38.park@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Suggested-by: David Howells --- 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 3729cbe..530fae6 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? @@ -1858,7 +1858,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. =============================== @@ -1873,8 +1873,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: -- 1.9.1