summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-17 08:45:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-17 08:45:23 -0700
commit9786cff38a31c452e32fd2f9a479dd7d19d91712 (patch)
tree1197c2e7a4e8973d19919f54f342fba6067488e2 /kernel
parent1b3dfde386b7c72b8f5430dc40eee538eb40c948 (diff)
parent1975dbc276c6ab62230cf4f9df5ddc9ff0e0e473 (diff)
downloadlinux-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 'kernel')
-rw-r--r--kernel/locking/qspinlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c
index 337c8818541d..87e9ce6a63c5 100644
--- a/kernel/locking/qspinlock.c
+++ b/kernel/locking/qspinlock.c
@@ -289,7 +289,7 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val)
if (pv_enabled())
goto queue;
- if (virt_queued_spin_lock(lock))
+ if (virt_spin_lock(lock))
return;
/*