summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-01 11:27:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-01 11:27:04 -0800
commit2ea51b884b07ac7fbb49eb91860eb05c13161ad2 (patch)
tree15c218993387a1603ddab315b4bd95d5e29a17ea /kernel
parentae1aa797e0ace9bbce055e31de1f641e422a082a (diff)
parent9d3e2d02f54160725d97f4ab1e1e8de493fbf33a (diff)
downloadlinux-2ea51b884b07ac7fbb49eb91860eb05c13161ad2.tar.bz2
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/locking/rtmutex.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index e16e5542bf13..6357265a31ad 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -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);