diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2024-12-20 17:31:19 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2024-12-20 17:31:19 +0300 |
| commit | c2db11a750fb626d0d04f2dc76e548a1f07617df (patch) | |
| tree | 01c899b2a06855633ae991f2064242f976987809 /kernel/locking/rtmutex_api.c | |
| parent | 63a48181fbcddefe5fb4c6618938bb64c543945b (diff) | |
| parent | 4a077914578183ec397ad09f7156a357e00e5d72 (diff) | |
| download | linux-c2db11a750fb626d0d04f2dc76e548a1f07617df.tar.xz | |
Merge branch 'locking/urgent'
Sync with urgent -- avoid conflicts.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/locking/rtmutex_api.c')
| -rw-r--r-- | kernel/locking/rtmutex_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c index 33ea31d6a7b3..191e4720e546 100644 --- a/kernel/locking/rtmutex_api.c +++ b/kernel/locking/rtmutex_api.c @@ -383,7 +383,7 @@ int __sched rt_mutex_wait_proxy_lock(struct rt_mutex_base *lock, raw_spin_lock_irq(&lock->wait_lock); /* sleep on the mutex */ set_current_state(TASK_INTERRUPTIBLE); - ret = rt_mutex_slowlock_block(lock, NULL, TASK_INTERRUPTIBLE, to, waiter); + ret = rt_mutex_slowlock_block(lock, NULL, TASK_INTERRUPTIBLE, to, waiter, NULL); /* * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might * have to fix that up. |