From 1dfae2e3285d1e1de8e3b280d4569214a9c602b0 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:36 +0100 Subject: [PATCH] Revert "rtmutex: Drop rt_mutex::wait_lock before scheduling" This reverts commit 07dcd58fea45d7807582a362830481970b220c54. --- kernel/locking/rtmutex.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index bfcb9c790..419cc6639 100755 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1205,7 +1205,6 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, } static void rt_mutex_handle_deadlock(int res, int detect_deadlock, - struct rt_mutex *lock, 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) return; - raw_spin_unlock_irq(&lock->wait_lock); /* * Yell lowdly and stop the task right here. */ @@ -1271,7 +1269,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, if (unlikely(ret)) { __set_current_state(TASK_RUNNING); remove_waiter(lock, &waiter); - rt_mutex_handle_deadlock(ret, chwalk, lock, &waiter); + rt_mutex_handle_deadlock(ret, chwalk, &waiter); } /*