From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753222AbbIHHHf (ORCPT ); Tue, 8 Sep 2015 03:07:35 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46748 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbbIHHHd (ORCPT ); Tue, 8 Sep 2015 03:07:33 -0400 Date: Tue, 8 Sep 2015 00:06:41 -0700 From: tip-bot for Jonathan Corbet Message-ID: Cc: torvalds@linux-foundation.org, peterz@infradead.org, paulmck@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, corbet@lwn.net, jbaron@akamai.com, hpa@zytor.com, tglx@linutronix.de, akpm@linux-foundation.org, mingo@kernel.org Reply-To: tglx@linutronix.de, jbaron@akamai.com, corbet@lwn.net, hpa@zytor.com, akpm@linux-foundation.org, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, linux-kernel@vger.kernel.org, paulmck@linux.vnet.ibm.com In-Reply-To: <20150907131803.54c027e1@lwn.net> References: <20150907131803.54c027e1@lwn.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] locking/static_keys: Fix a silly typo Git-Commit-ID: edcd591c77a48da753456f92daf8bb50fe9bac93 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: edcd591c77a48da753456f92daf8bb50fe9bac93 Gitweb: http://git.kernel.org/tip/edcd591c77a48da753456f92daf8bb50fe9bac93 Author: Jonathan Corbet AuthorDate: Mon, 7 Sep 2015 13:18:03 -0600 Committer: Ingo Molnar CommitDate: Tue, 8 Sep 2015 09:02:17 +0200 locking/static_keys: Fix a silly typo Commit: 412758cb2670 ("jump label, locking/static_keys: Update docs") introduced a typo that might as well get fixed. Signed-off-by: Jonathan Corbet Cc: Andrew Morton Cc: Jason Baron Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150907131803.54c027e1@lwn.net Signed-off-by: Ingo Molnar --- Documentation/static-keys.txt | 2 +- include/linux/jump_label.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt index f4cb0b2..ec91158 100644 --- a/Documentation/static-keys.txt +++ b/Documentation/static-keys.txt @@ -16,7 +16,7 @@ The updated API replacements are: DEFINE_STATIC_KEY_TRUE(key); DEFINE_STATIC_KEY_FALSE(key); static_key_likely() -statick_key_unlikely() +static_key_unlikely() 0) Abstract diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 7f653e8..0684bd3 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -22,7 +22,7 @@ * DEFINE_STATIC_KEY_TRUE(key); * DEFINE_STATIC_KEY_FALSE(key); * static_key_likely() - * statick_key_unlikely() + * static_key_unlikely() * * Jump labels provide an interface to generate dynamic branches using * self-modifying code. Assuming toolchain and architecture support, if we