Commit 199cacd1 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ingo Molnar
Browse files

locking/rtmutex: Consolidate rt_mutex_init() 



rt_mutex_init() only initializes lockdep if CONFIG_DEBUG_RT_MUTEXES is
enabled, which is fine because all lockdep variants select it, but there is
no reason to do so.

Move the function outside of the CONFIG_DEBUG_RT_MUTEXES block which
removes #ifdeffery.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
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.437405350@linutronix.de
parent 6d41c675

include/linux/rtmutex.h

+3 −9
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct hrtimer_sleeper; 
 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)
@@ -50,22 +51,15 @@ struct hrtimer_sleeper; 
	return 0;

 }

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

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

#endif



#ifdef CONFIG_DEBUG_RT_MUTEXES



#define rt_mutex_init(mutex) \

do { \

	static struct lock_class_key __key; \

	__rt_mutex_init(mutex, __func__, &__key); \

} while (0)



 extern void rt_mutex_debug_task_free(struct task_struct *tsk);

#else

# define rt_mutex_init(mutex)			__rt_mutex_init(mutex, NULL, NULL)

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

#endif



#ifdef CONFIG_DEBUG_LOCK_ALLOC

#define __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname) \

	, .dep_map = { .name = #mutexname }