summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2015-09-07 13:18:03 -0600
committerIngo Molnar <mingo@kernel.org>2015-09-08 09:02:17 +0200
commitedcd591c77a48da753456f92daf8bb50fe9bac93 (patch)
treee6dc619e1ce86cd63327f28780029f659f30686a
parentd420acd816c07c7be31bd19d09cbcb16e5572fa6 (diff)
downloadlinux-edcd591c77a48da753456f92daf8bb50fe9bac93.tar.gz
linux-edcd591c77a48da753456f92daf8bb50fe9bac93.tar.bz2
linux-edcd591c77a48da753456f92daf8bb50fe9bac93.zip
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 <corbet@lwn.net> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jason Baron <jbaron@akamai.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20150907131803.54c027e1@lwn.net Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--Documentation/static-keys.txt2
-rw-r--r--include/linux/jump_label.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt
index f4cb0b2d5cd7..ec911583f6c5 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 7f653e8f6690..0684bd3a48fc 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