From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751676AbbIOFQ3 (ORCPT ); Tue, 15 Sep 2015 01:16:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49119 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbbIOFQ2 (ORCPT ); Tue, 15 Sep 2015 01:16:28 -0400 Date: Mon, 14 Sep 2015 22:15:42 -0700 From: tip-bot for Jonathan Corbet Message-ID: Cc: corbet@lwn.net, hpa@zytor.com, tglx@linutronix.de, jbaron@akamai.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org Reply-To: mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, hpa@zytor.com, jbaron@akamai.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <20150914171105.511e1e21@lwn.net> References: <20150914171105.511e1e21@lwn.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] locking/static_keys: Fix up the static keys documentation Git-Commit-ID: 1975dbc276c6ab62230cf4f9df5ddc9ff0e0e473 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1975dbc276c6ab62230cf4f9df5ddc9ff0e0e473 Gitweb: http://git.kernel.org/tip/1975dbc276c6ab62230cf4f9df5ddc9ff0e0e473 Author: Jonathan Corbet AuthorDate: Mon, 14 Sep 2015 17:11:05 -0600 Committer: Ingo Molnar CommitDate: Tue, 15 Sep 2015 07:12:06 +0200 locking/static_keys: Fix up the static keys documentation Fix a few small mistakes in the static key documentation and delete an unneeded sentence. Suggested-by: Jason Baron Signed-off-by: Jonathan Corbet Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150914171105.511e1e21@lwn.net Signed-off-by: Ingo Molnar --- Documentation/static-keys.txt | 4 ++-- include/linux/jump_label.h | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt index ec91158..477927b 100644 --- a/Documentation/static-keys.txt +++ b/Documentation/static-keys.txt @@ -15,8 +15,8 @@ The updated API replacements are: DEFINE_STATIC_KEY_TRUE(key); DEFINE_STATIC_KEY_FALSE(key); -static_key_likely() -static_key_unlikely() +static_branch_likely() +static_branch_unlikely() 0) Abstract diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 0684bd3..f109423 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -21,8 +21,8 @@ * * DEFINE_STATIC_KEY_TRUE(key); * DEFINE_STATIC_KEY_FALSE(key); - * static_key_likely() - * static_key_unlikely() + * static_branch_likely() + * static_branch_unlikely() * * Jump labels provide an interface to generate dynamic branches using * self-modifying code. Assuming toolchain and architecture support, if we @@ -45,12 +45,10 @@ * statement, setting the key to true requires us to patch in a jump * to the out-of-line of true branch. * - * In addtion to static_branch_{enable,disable}, we can also reference count + * In addition to static_branch_{enable,disable}, we can also reference count * the key or branch direction via static_branch_{inc,dec}. Thus, * static_branch_inc() can be thought of as a 'make more true' and - * static_branch_dec() as a 'make more false'. The inc()/dec() - * interface is meant to be used exclusively from the inc()/dec() for a given - * key. + * static_branch_dec() as a 'make more false'. * * Since this relies on modifying code, the branch modifying functions * must be considered absolute slow paths (machine wide synchronization etc.).