diff options
| author | Waiman Long <longman@redhat.com> | 2024-02-22 10:05:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-28 13:08:37 +0100 |
| commit | d6cac0b6b0115fd0a5f51a49401473626e4e4fe7 (patch) | |
| tree | a97f233a82d71861781027b42c4d85c45ebe18af /include | |
| parent | ca4bc2e07b716509fd279d2b449bb42f4263a9c8 (diff) | |
| download | linux-stable-d6cac0b6b0115fd0a5f51a49401473626e4e4fe7.tar.gz linux-stable-d6cac0b6b0115fd0a5f51a49401473626e4e4fe7.tar.bz2 linux-stable-d6cac0b6b0115fd0a5f51a49401473626e4e4fe7.zip | |
locking/mutex: Simplify <linux/mutex.h>
CONFIG_DEBUG_MUTEXES and CONFIG_PREEMPT_RT are mutually exclusive. They
can't be both set at the same time. Move up the mutex_destroy() function
declaration and the __DEBUG_MUTEX_INITIALIZER() macro above the "#ifndef
CONFIG_PREEMPT_RT" section to eliminate duplicated mutex_destroy()
declaration.
Also remove the duplicated mutex_trylock() function declaration in the
CONFIG_PREEMPT_RT section.
Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20240222150540.79981-3-longman@redhat.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mutex.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 7e208d46ba5b..67edc4ca2bee 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -32,11 +32,9 @@ # define __DEP_MAP_MUTEX_INITIALIZER(lockname) #endif -#ifndef CONFIG_PREEMPT_RT - #ifdef CONFIG_DEBUG_MUTEXES -#define __DEBUG_MUTEX_INITIALIZER(lockname) \ +# define __DEBUG_MUTEX_INITIALIZER(lockname) \ , .magic = &lockname extern void mutex_destroy(struct mutex *lock); @@ -49,6 +47,7 @@ static inline void mutex_destroy(struct mutex *lock) {} #endif +#ifndef CONFIG_PREEMPT_RT /** * mutex_init - initialize the mutex * @mutex: the mutex to be initialized @@ -101,9 +100,6 @@ extern bool mutex_is_locked(struct mutex *lock); extern void __mutex_rt_init(struct mutex *lock, const char *name, struct lock_class_key *key); -extern int mutex_trylock(struct mutex *lock); - -static inline void mutex_destroy(struct mutex *lock) { } #define mutex_is_locked(l) rt_mutex_base_is_locked(&(l)->rtmutex) |