| Subject: rtmutex: Remove unused argument from rt_mutex_proxy_unlock() |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Wed Jan 20 11:32:07 2021 +0100 |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| commit 2156ac1934166d6deb6cd0f6ffc4c1076ec63697 upstream |
| |
| Nothing uses the argument. Remove it as preparation to use |
| pi_state_update_owner(). |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| kernel/futex.c | 2 +- |
| kernel/locking/rtmutex.c | 3 +-- |
| kernel/locking/rtmutex_common.h | 3 +-- |
| 3 files changed, 3 insertions(+), 5 deletions(-) |
| |
| --- a/kernel/futex.c |
| +++ b/kernel/futex.c |
| @@ -912,7 +912,7 @@ static void put_pi_state(struct futex_pi |
| list_del_init(&pi_state->list); |
| raw_spin_unlock(&owner->pi_lock); |
| } |
| - rt_mutex_proxy_unlock(&pi_state->pi_mutex, owner); |
| + rt_mutex_proxy_unlock(&pi_state->pi_mutex); |
| raw_spin_unlock_irqrestore(&pi_state->pi_mutex.wait_lock, flags); |
| } |
| |
| --- a/kernel/locking/rtmutex.c |
| +++ b/kernel/locking/rtmutex.c |
| @@ -1718,8 +1718,7 @@ void rt_mutex_init_proxy_locked(struct r |
| * possible because it belongs to the pi_state which is about to be freed |
| * and it is not longer visible to other tasks. |
| */ |
| -void rt_mutex_proxy_unlock(struct rt_mutex *lock, |
| - struct task_struct *proxy_owner) |
| +void rt_mutex_proxy_unlock(struct rt_mutex *lock) |
| { |
| debug_rt_mutex_proxy_unlock(lock); |
| rt_mutex_set_owner(lock, NULL); |
| --- a/kernel/locking/rtmutex_common.h |
| +++ b/kernel/locking/rtmutex_common.h |
| @@ -133,8 +133,7 @@ enum rtmutex_chainwalk { |
| extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock); |
| extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock, |
| struct task_struct *proxy_owner); |
| -extern void rt_mutex_proxy_unlock(struct rt_mutex *lock, |
| - struct task_struct *proxy_owner); |
| +extern void rt_mutex_proxy_unlock(struct rt_mutex *lock); |
| extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter); |
| extern int __rt_mutex_start_proxy_lock(struct rt_mutex *lock, |
| struct rt_mutex_waiter *waiter, |
