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

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

futex: Remove rt_mutex_deadlock_account_*() 



From: Peter Zijlstra <peterz@infradead.org>

These are unused and clutter up the code.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: juri.lelli@arm.com
Cc: bigeasy@linutronix.de
Cc: xlpang@redhat.com
Cc: rostedt@goodmis.org
Cc: mathieu.desnoyers@efficios.com
Cc: jdesfossez@efficios.com
Cc: dvhart@infradead.org
Cc: bristot@redhat.com
Link: http://lkml.kernel.org/r/20170322104151.652692478@infradead.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
[Lee: Back-ported to solve a dependency]
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6510e4a2

kernel/locking/rtmutex-debug.c

+0 −9
Original line number Diff line number Diff line
@@ -173,12 +173,3 @@ void debug_rt_mutex_init(struct rt_mutex *lock, const char *name) 
	lock->name = name;

}

void

rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task)

{

}



void rt_mutex_deadlock_account_unlock(struct task_struct *task)

{

}

kernel/locking/rtmutex-debug.h

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
 * This file contains macros used solely by rtmutex.c. Debug version.

 */



extern void

rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);

extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);

extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);

extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);

extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);

kernel/locking/rtmutex.c

+16 −26
Original line number Diff line number Diff line
@@ -937,8 +937,6 @@ takeit: 
	 */

	rt_mutex_set_owner(lock, task);



	rt_mutex_deadlock_account_lock(lock, task);



	return 1;

}
@@ -1331,8 +1329,6 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock, 


	debug_rt_mutex_unlock(lock);



	rt_mutex_deadlock_account_unlock(current);



	/*

	 * We must be careful here if the fast path is enabled. If we

	 * have no waiters queued we cannot set owner to NULL here
@@ -1398,10 +1394,9 @@ rt_mutex_fastlock(struct rt_mutex *lock, int state, 
				struct hrtimer_sleeper *timeout,

				enum rtmutex_chainwalk chwalk))

{

	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {

		rt_mutex_deadlock_account_lock(lock, current);

	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))

		return 0;

	} else



	return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK);

}
@@ -1414,10 +1409,9 @@ rt_mutex_timed_fastlock(struct rt_mutex *lock, int state, 
				      enum rtmutex_chainwalk chwalk))

{

	if (chwalk == RT_MUTEX_MIN_CHAINWALK &&

	    likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {

		rt_mutex_deadlock_account_lock(lock, current);

	    likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))

		return 0;

	} else



	return slowfn(lock, state, timeout, chwalk);

}
@@ -1425,10 +1419,9 @@ static inline int 
rt_mutex_fasttrylock(struct rt_mutex *lock,

		     int (*slowfn)(struct rt_mutex *lock))

{

	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {

		rt_mutex_deadlock_account_lock(lock, current);

	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))

		return 1;

	}



	return slowfn(lock);

}
@@ -1438,12 +1431,12 @@ rt_mutex_fastunlock(struct rt_mutex *lock, 
				   struct wake_q_head *wqh))

{

	WAKE_Q(wake_q);

	bool deboost;



	if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {

		rt_mutex_deadlock_account_unlock(current);

	if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))

		return;



	} else {

		bool deboost = slowfn(lock, &wake_q);

	deboost = slowfn(lock, &wake_q);



	wake_up_q(&wake_q);
@@ -1451,7 +1444,6 @@ rt_mutex_fastunlock(struct rt_mutex *lock, 
	if (deboost)

		rt_mutex_adjust_prio(current);

}

}



/**

 * rt_mutex_lock - lock a rt_mutex
@@ -1648,7 +1640,6 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock, 
	__rt_mutex_init(lock, NULL);

	debug_rt_mutex_proxy_lock(lock, proxy_owner);

	rt_mutex_set_owner(lock, proxy_owner);

	rt_mutex_deadlock_account_lock(lock, proxy_owner);

}



/**
@@ -1664,7 +1655,6 @@ void rt_mutex_proxy_unlock(struct rt_mutex *lock, 
{

	debug_rt_mutex_proxy_unlock(lock);

	rt_mutex_set_owner(lock, NULL);

	rt_mutex_deadlock_account_unlock(proxy_owner);

}



/**

kernel/locking/rtmutex.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
 */



#define rt_mutex_deadlock_check(l)			(0)

#define rt_mutex_deadlock_account_lock(m, t)		do { } while (0)

#define rt_mutex_deadlock_account_unlock(l)		do { } while (0)

#define debug_rt_mutex_init_waiter(w)			do { } while (0)

#define debug_rt_mutex_free_waiter(w)			do { } while (0)

#define debug_rt_mutex_lock(l)				do { } while (0)