Skip to contentSkip to conversation

locking fix

GIT PULL Ingo Molnar 1 participant 1 message Mar 1, 2015 Locking primitives

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest locking-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus

# HEAD: 9d3e2d02f54160725d97f4ab1e1e8de493fbf33a locking/rtmutex: Set state back to running on error

An rtmutex deadlock path fixlet.

Thanks,

Ingo

------------------>
Sebastian Andrzej Siewior (1):
locking/rtmutex: Set state back to running on error

 kernel/locking/rtmutex.c | 1 +
 1 file changed, 1 insertion(+)
kernel/locking/rtmutex.c +1 -0
index e16e5542bf13..6357265a31ad 100644
@@ -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);