aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2021-12-18 10:57:03 +0100
committerThomas Gleixner <tglx@linutronix.de>2021-12-18 10:57:03 +0100
commitf16cc980d649e664b8f41e1bbaba50255d24e5d1 (patch)
tree4288957c96b6b4044977897d587e4d5da09a3555 /kernel
parentlocking/atomic: atomic64: Remove unusable atomic ops (diff)
parentlocking/rtmutex: Fix incorrect condition in rtmutex_spin_on_owner() (diff)
downloadlinux-dev-f16cc980d649e664b8f41e1bbaba50255d24e5d1.tar.xz
linux-dev-f16cc980d649e664b8f41e1bbaba50255d24e5d1.zip
Merge branch 'locking/urgent' into locking/core
Pick up the spin loop condition fix. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/locking/rtmutex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 0c1f2e3f019a..8555c4efe97c 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1383,7 +1383,7 @@ static bool rtmutex_spin_on_owner(struct rt_mutex_base *lock,
* - the VCPU on which owner runs is preempted
*/
if (!owner_on_cpu(owner) || need_resched() ||
- rt_mutex_waiter_is_top_waiter(lock, waiter)) {
+ !rt_mutex_waiter_is_top_waiter(lock, waiter)) {
res = false;
break;
}