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

Commit cfe591bb authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: rtmutex: Remove unused argument from rt_mutex_proxy_unlock() 



commit 2156ac1934166d6deb6cd0f6ffc4c1076ec63697 upstream

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 avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 2156ac1934166d6deb6cd0f6ffc4c1076ec63697)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I126088d93c5f05db654e508dfd4195e5c1696164
parent a60fba30

kernel/futex.c

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static void put_pi_state(struct futex_pi_state *pi_state) 
			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);

	}

kernel/locking/rtmutex.c

+1 −2
Original line number Diff line number Diff line
@@ -1718,8 +1718,7 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock, 
 * 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);

kernel/locking/rtmutex_common.h

+1 −2
Original line number Diff line number Diff line
@@ -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,