Merge branch 'locking/urgent' into locking/core

KAGA-KOKO · KAGA-KOKO · commit f16cc980d649 · 2021-12-18T10:57:03.000+01:00
Pick up the spin loop condition fix.

Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1383,7 +1383,7 @@ static bool rtmutex_spin_on_owner(struct rt_mutex_base *lock,`
`1383`	`1383`	`* - the VCPU on which owner runs is preempted`
`1384`	`1384`	`*/`
`1385`	`1385`	`if (!owner_on_cpu(owner) \|\| need_resched() \|\|`
`1386`		`- rt_mutex_waiter_is_top_waiter(lock, waiter)) {`
	`1386`	`+ !rt_mutex_waiter_is_top_waiter(lock, waiter)) {`
`1387`	`1387`	`res = false;`
`1388`	`1388`	`break;`
`1389`	`1389`	`}`