Skip to content

Commit 6d28ac5

Browse files
KAGA-KOKOgregkh
authored andcommitted
rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
commit 2156ac1 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>
1 parent 5b2c5a9 commit 6d28ac5

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

kernel/futex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ static void put_pi_state(struct futex_pi_state *pi_state)
820820
list_del_init(&pi_state->list);
821821
raw_spin_unlock(&owner->pi_lock);
822822
}
823-
rt_mutex_proxy_unlock(&pi_state->pi_mutex, owner);
823+
rt_mutex_proxy_unlock(&pi_state->pi_mutex);
824824
raw_spin_unlock_irqrestore(&pi_state->pi_mutex.wait_lock, flags);
825825
}
826826

kernel/locking/rtmutex.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,8 +1716,7 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
17161716
* possible because it belongs to the pi_state which is about to be freed
17171717
* and it is not longer visible to other tasks.
17181718
*/
1719-
void rt_mutex_proxy_unlock(struct rt_mutex *lock,
1720-
struct task_struct *proxy_owner)
1719+
void rt_mutex_proxy_unlock(struct rt_mutex *lock)
17211720
{
17221721
debug_rt_mutex_proxy_unlock(lock);
17231722
rt_mutex_set_owner(lock, NULL);

kernel/locking/rtmutex_common.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ enum rtmutex_chainwalk {
133133
extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
134134
extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
135135
struct task_struct *proxy_owner);
136-
extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
137-
struct task_struct *proxy_owner);
136+
extern void rt_mutex_proxy_unlock(struct rt_mutex *lock);
138137
extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
139138
extern int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
140139
struct rt_mutex_waiter *waiter,

0 commit comments

Comments
 (0)