Commit 96f80528 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

locking/mutex: Define mutex_init() once 



With CONFIG_PREEMPT_RT disabled __mutex_init() is a function. With
CONFIG_PREEMPT_RT enabled, __mutex_init() is a macro. I assume this is why
mutex_init() is defined twice as exactly the same macro.

Prepare for introducing a new macro for mutex initialization by combining
the two identical mutex_init() definitions into a single definition. This
patch does not change any functionality because the C preprocessor expands
macros when it encounters the macro name and not when a macro definition
is encountered. See also commit bb630f9f ("locking/rtmutex: Add mutex
variant for RT").

Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240912223956.3554086-2-bvanassche@acm.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2193ede1

include/linux/mutex.h

+1 −7
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static inline void mutex_destroy(struct mutex *lock) {} 


#endif



#ifndef CONFIG_PREEMPT_RT

/**

 * mutex_init - initialize the mutex

 * @mutex: the mutex to be initialized
@@ -65,6 +64,7 @@ do { \ 
	__mutex_init((mutex), #mutex, &__key);				\

} while (0)



#ifndef CONFIG_PREEMPT_RT

#define __MUTEX_INITIALIZER(lockname) \

		{ .owner = ATOMIC_LONG_INIT(0) \

		, .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
@@ -111,12 +111,6 @@ do { \ 
	__mutex_rt_init((mutex), name, key);		\

} while (0)



#define mutex_init(mutex)				\

do {							\

	static struct lock_class_key __key;		\

							\

	__mutex_init((mutex), #mutex, &__key);		\

} while (0)

#endif /* CONFIG_PREEMPT_RT */



#ifdef CONFIG_DEBUG_MUTEXES