Commit 8188d74e authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

locking/rtmutex: Remove empty and unused debug stubs 



No users or useless and therefore just ballast.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210326153943.549192485@linutronix.de
parent 199cacd1

include/linux/rtmutex.h

+2 −12
Original line number Diff line number Diff line
@@ -40,18 +40,9 @@ struct rt_mutex_waiter; 
struct hrtimer_sleeper;



#ifdef CONFIG_DEBUG_RT_MUTEXES

 extern int rt_mutex_debug_check_no_locks_freed(const void *from,

						unsigned long len);

 extern void rt_mutex_debug_check_no_locks_held(struct task_struct *task);

extern void rt_mutex_debug_task_free(struct task_struct *tsk);

#else

 static inline int rt_mutex_debug_check_no_locks_freed(const void *from,

						       unsigned long len)

 {

	return 0;

 }

# define rt_mutex_debug_check_no_locks_held(task)	do { } while (0)

# define rt_mutex_debug_task_free(t)			do { } while (0)

static inline void rt_mutex_debug_task_free(struct task_struct *tsk) { }

#endif



#define rt_mutex_init(mutex) \
@@ -88,7 +79,6 @@ static inline int rt_mutex_is_locked(struct rt_mutex *lock) 
}



extern void __rt_mutex_init(struct rt_mutex *lock, const char *name, struct lock_class_key *key);

extern void rt_mutex_destroy(struct rt_mutex *lock);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

extern void rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subclass);

kernel/locking/rtmutex-debug.c

+0 −9
Original line number Diff line number Diff line
@@ -38,20 +38,11 @@ void rt_mutex_debug_task_free(struct task_struct *task) 
	DEBUG_LOCKS_WARN_ON(task->pi_blocked_on);

}



void debug_rt_mutex_lock(struct rt_mutex *lock)

{

}



void debug_rt_mutex_unlock(struct rt_mutex *lock)

{

	DEBUG_LOCKS_WARN_ON(rt_mutex_owner(lock) != current);

}



void

debug_rt_mutex_proxy_lock(struct rt_mutex *lock, struct task_struct *powner)

{

}



void debug_rt_mutex_proxy_unlock(struct rt_mutex *lock)

{

	DEBUG_LOCKS_WARN_ON(!rt_mutex_owner(lock));

kernel/locking/rtmutex-debug.h

+0 −3
Original line number Diff line number Diff line
@@ -13,10 +13,7 @@ 
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, struct lock_class_key *key);

extern void debug_rt_mutex_lock(struct rt_mutex *lock);

extern void debug_rt_mutex_unlock(struct rt_mutex *lock);

extern void debug_rt_mutex_proxy_lock(struct rt_mutex *lock,

				      struct task_struct *powner);

extern void debug_rt_mutex_proxy_unlock(struct rt_mutex *lock);



static inline bool debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter,

kernel/locking/rtmutex.c

+0 −18
Original line number Diff line number Diff line
@@ -885,9 +885,6 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, 
	raw_spin_unlock(&task->pi_lock);



takeit:

	/* We got the lock. */

	debug_rt_mutex_lock(lock);



	/*

	 * This either preserves the RT_MUTEX_HAS_WAITERS bit if there

	 * are still waiters or clears it.
@@ -1580,20 +1577,6 @@ void __sched rt_mutex_futex_unlock(struct rt_mutex *lock) 
		rt_mutex_postunlock(&wake_q);

}



/**

 * rt_mutex_destroy - mark a mutex unusable

 * @lock: the mutex to be destroyed

 *

 * This function marks the mutex uninitialized, and any subsequent

 * use of the mutex is forbidden. The mutex must not be locked when

 * this function is called.

 */

void rt_mutex_destroy(struct rt_mutex *lock)

{

	WARN_ON(rt_mutex_is_locked(lock));

}

EXPORT_SYMBOL_GPL(rt_mutex_destroy);



/**

 * __rt_mutex_init - initialize the rt_mutex

 *
@@ -1635,7 +1618,6 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock, 
				struct task_struct *proxy_owner)

{

	__rt_mutex_init(lock, NULL, NULL);

	debug_rt_mutex_proxy_lock(lock, proxy_owner);

	rt_mutex_set_owner(lock, proxy_owner);

}

kernel/locking/rtmutex.h

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 


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

#define debug_rt_mutex_proxy_lock(l,p)			do { } while (0)

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

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

#define debug_rt_mutex_init(m, n, k)			do { } while (0)