diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rtmutex.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index d9ca207ce..e64a7b2af 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -744,6 +744,7 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, set_current_state(state); } + __set_current_state(TASK_RUNNING); return ret; } @@ -800,10 +801,9 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, ret = task_blocks_on_rt_mutex(lock, &waiter, current, detect_deadlock); if (likely(!ret)) + /* sleep on the mutex */ ret = __rt_mutex_slowlock(lock, state, timeout, &waiter); - set_current_state(TASK_RUNNING); - if (unlikely(ret)) { remove_waiter(lock, &waiter); rt_mutex_handle_deadlock(ret, detect_deadlock, &waiter); @@ -1222,10 +1222,9 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, set_current_state(TASK_INTERRUPTIBLE); + /* sleep on the mutex */ ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter); - set_current_state(TASK_RUNNING); - if (unlikely(ret)) remove_waiter(lock, waiter); |