Commit 2ea51b88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Ingo Molnar:
 "An rtmutex deadlock path fixlet"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/rtmutex: Set state back to running on error
parents ae1aa797 9d3e2d02

kernel/locking/rtmutex.c

+1 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, 
		ret = __rt_mutex_slowlock(lock, state, timeout, &waiter);



	if (unlikely(ret)) {

		__set_current_state(TASK_RUNNING);

		if (rt_mutex_has_waiters(lock))

			remove_waiter(lock, &waiter);

		rt_mutex_handle_deadlock(ret, chwalk, &waiter);