diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-17 08:45:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-17 08:45:23 -0700 |
| commit | 9786cff38a31c452e32fd2f9a479dd7d19d91712 (patch) | |
| tree | 1197c2e7a4e8973d19919f54f342fba6067488e2 /Documentation | |
| parent | 1b3dfde386b7c72b8f5430dc40eee538eb40c948 (diff) | |
| parent | 1975dbc276c6ab62230cf4f9df5ddc9ff0e0e473 (diff) | |
| download | linux-9786cff38a31c452e32fd2f9a479dd7d19d91712.tar.bz2 | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Spinlock performance regression fix, plus documentation fixes"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/static_keys: Fix up the static keys documentation
locking/qspinlock/x86: Only emit the test-and-set fallback when building guest support
locking/qspinlock/x86: Fix performance regression under unaccelerated VMs
locking/static_keys: Fix a silly typo
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/static-keys.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt index f4cb0b2d5cd7..477927becacb 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() -statick_key_unlikely() +static_branch_likely() +static_branch_unlikely() 0) Abstract |