projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a32215f8 GKH |
1 | From foo@baz Thu Feb 4 04:13:47 PM CET 2021 |
| 2 | From: Lee Jones <lee.jones@linaro.org> | |
| 3 | Date: Wed, 3 Feb 2021 13:45:36 +0000 | |
| 4 | Subject: rtmutex: Remove unused argument from rt_mutex_proxy_unlock() | |
| 5 | To: stable@vger.kernel.org | |
| 6 | Cc: Thomas Gleixner <tglx@linutronix.de>, Peter Zijlstra <peterz@infradead.org>, Lee Jones <lee.jones@linaro.org> | |
| 7 | Message-ID: <20210203134539.2583943-8-lee.jones@linaro.org> | |
| 8 | ||
| 9 | From: Thomas Gleixner <tglx@linutronix.de> | |
| 10 | ||
| 11 | [ Upstream commit 2156ac1934166d6deb6cd0f6ffc4c1076ec63697 ] | |
| 12 | Nothing uses the argument. Remove it as preparation to use | |
| 13 | pi_state_update_owner(). | |
| 14 | ||
| 15 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> | |
| 16 | Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> | |
| 17 | Cc: stable@vger.kernel.org | |
| 18 | Signed-off-by: Lee Jones <lee.jones@linaro.org> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 20 | --- | |
| 21 | kernel/futex.c | 2 +- | |
| 22 | kernel/locking/rtmutex.c | 3 +-- | |
| 23 | kernel/locking/rtmutex_common.h | 3 +-- | |
| 24 | 3 files changed, 3 insertions(+), 5 deletions(-) | |
| 25 | ||
| 26 | --- a/kernel/futex.c | |
| 27 | +++ b/kernel/futex.c | |
| 28 | @@ -883,7 +883,7 @@ static void put_pi_state(struct futex_pi | |
| 29 | list_del_init(&pi_state->list); | |
| 30 | raw_spin_unlock_irq(&pi_state->owner->pi_lock); | |
| 31 | ||
| 32 | - rt_mutex_proxy_unlock(&pi_state->pi_mutex, pi_state->owner); | |
| 33 | + rt_mutex_proxy_unlock(&pi_state->pi_mutex); | |
| 34 | } | |
| 35 | ||
| 36 | if (current->pi_state_cache) | |
| 37 | --- a/kernel/locking/rtmutex.c | |
| 38 | +++ b/kernel/locking/rtmutex.c | |
| 39 | @@ -1696,8 +1696,7 @@ void rt_mutex_init_proxy_locked(struct r | |
| 40 | * No locking. Caller has to do serializing itself | |
| 41 | * Special API call for PI-futex support | |
| 42 | */ | |
| 43 | -void rt_mutex_proxy_unlock(struct rt_mutex *lock, | |
| 44 | - struct task_struct *proxy_owner) | |
| 45 | +void rt_mutex_proxy_unlock(struct rt_mutex *lock) | |
| 46 | { | |
| 47 | debug_rt_mutex_proxy_unlock(lock); | |
| 48 | rt_mutex_set_owner(lock, NULL); | |
| 49 | --- a/kernel/locking/rtmutex_common.h | |
| 50 | +++ b/kernel/locking/rtmutex_common.h | |
| 51 | @@ -102,8 +102,7 @@ enum rtmutex_chainwalk { | |
| 52 | extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock); | |
| 53 | extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock, | |
| 54 | struct task_struct *proxy_owner); | |
| 55 | -extern void rt_mutex_proxy_unlock(struct rt_mutex *lock, | |
| 56 | - struct task_struct *proxy_owner); | |
| 57 | +extern void rt_mutex_proxy_unlock(struct rt_mutex *lock); | |
| 58 | extern int rt_mutex_start_proxy_lock(struct rt_mutex *lock, | |
| 59 | struct rt_mutex_waiter *waiter, | |
| 60 | struct task_struct *task); |