Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42255927 authored by Lee Jones's avatar Lee Jones Committed by Greg Kroah-Hartman
Browse files

rtmutex: Remove unused argument from rt_mutex_proxy_unlock() 



From: Thomas Gleixner <tglx@linutronix.de>

[ Upstream commit 2156ac1934166d6deb6cd0f6ffc4c1076ec63697 ]
Nothing uses the argument. Remove it as preparation to use
pi_state_update_owner().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34c8e1c2

kernel/futex.c

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ static void free_pi_state(struct futex_pi_state *pi_state) 
		list_del_init(&pi_state->list);

		raw_spin_unlock_irq(&pi_state->owner->pi_lock);



		rt_mutex_proxy_unlock(&pi_state->pi_mutex, pi_state->owner);

		rt_mutex_proxy_unlock(&pi_state->pi_mutex);

	}



	if (current->pi_state_cache)

kernel/locking/rtmutex.c

+1 −2
Original line number Diff line number Diff line
@@ -1662,8 +1662,7 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock, 
 * No locking. Caller has to do serializing itself

 * Special API call for PI-futex support

 */

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);

kernel/locking/rtmutex_common.h

+1 −2
Original line number Diff line number Diff line
@@ -101,8 +101,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 int rt_mutex_start_proxy_lock(struct rt_mutex *lock,

				     struct rt_mutex_waiter *waiter,

				     struct task_struct *task);