Commit f16cc980 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'locking/urgent' into locking/core 



Pick up the spin loop condition fix.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 5fb6e8cf 8f556a32

kernel/locking/rtmutex.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}