Revert "rtmutex: Drop rt_mutex::wait_lock before scheduling"
This reverts commit 07dcd58fea
.
This commit is contained in:
parent
7ce3a6de6c
commit
1dfae2e328
1 changed files with 1 additions and 3 deletions
|
@ -1205,7 +1205,6 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
|
static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
|
||||||
struct rt_mutex *lock,
|
|
||||||
struct rt_mutex_waiter *w)
|
struct rt_mutex_waiter *w)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -1215,7 +1214,6 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
|
||||||
if (res != -EDEADLOCK || detect_deadlock)
|
if (res != -EDEADLOCK || detect_deadlock)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
raw_spin_unlock_irq(&lock->wait_lock);
|
|
||||||
/*
|
/*
|
||||||
* Yell lowdly and stop the task right here.
|
* Yell lowdly and stop the task right here.
|
||||||
*/
|
*/
|
||||||
|
@ -1271,7 +1269,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
__set_current_state(TASK_RUNNING);
|
__set_current_state(TASK_RUNNING);
|
||||||
remove_waiter(lock, &waiter);
|
remove_waiter(lock, &waiter);
|
||||||
rt_mutex_handle_deadlock(ret, chwalk, lock, &waiter);
|
rt_mutex_handle_deadlock(ret, chwalk, &waiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue