diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-09 07:47:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-09 07:47:32 +0100 |
| commit | c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8 (patch) | |
| tree | 9bcfc2ea89e09ec2614e4d84518ffcb4327eb223 /kernel/locking/rtmutex_api.c | |
| parent | 5220cb493bf418cc4ce5f3ba961dbd0207441731 (diff) | |
| parent | b7bfaa761d760e72a969d116517eaa12e404c262 (diff) | |
| download | linux-c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8.tar.gz linux-c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8.zip | |
Merge 6.2-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/locking/rtmutex_api.c')
| -rw-r--r-- | kernel/locking/rtmutex_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c index 900220941caa..cb9fdff76a8a 100644 --- a/kernel/locking/rtmutex_api.c +++ b/kernel/locking/rtmutex_api.c @@ -267,7 +267,7 @@ void __sched rt_mutex_init_proxy_locked(struct rt_mutex_base *lock, void __sched rt_mutex_proxy_unlock(struct rt_mutex_base *lock) { debug_rt_mutex_proxy_unlock(lock); - rt_mutex_set_owner(lock, NULL); + rt_mutex_clear_owner(lock); } /** @@ -382,7 +382,7 @@ int __sched rt_mutex_wait_proxy_lock(struct rt_mutex_base *lock, * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might * have to fix that up. */ - fixup_rt_mutex_waiters(lock); + fixup_rt_mutex_waiters(lock, true); raw_spin_unlock_irq(&lock->wait_lock); return ret; @@ -438,7 +438,7 @@ bool __sched rt_mutex_cleanup_proxy_lock(struct rt_mutex_base *lock, * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might * have to fix that up. */ - fixup_rt_mutex_waiters(lock); + fixup_rt_mutex_waiters(lock, false); raw_spin_unlock_irq(&lock->wait_lock); |