Messages in this thread | ![/](/images/icornerl.gif) | | Date | Sat, 16 Dec 2023 14:47:31 +0300 | Subject | Re: [PATCH 1/2] locking/mutex: Clean up mutex.h | From | George Stark <> |
| |
Hello Waiman
Thanks for this patch! It'll be much easier to extend mutex.h with this change.
Just curious is there a reason we can't move mutex_init macro outside big #ifdef to eliminate duplicated declaration too?
Either way, Reviewed-by: George Stark <gnstark@salutedevices.com>
On 12/16/23 04:36, Waiman Long wrote: > CONFIG_DEBUG_MUTEXES and CONFIG_PREEMPT_RT are mutually exclusive. They > can't be both set at the same time. Move down the mutex_destroy() > function declaration to the bottom of mutex.h 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> > --- > include/linux/mutex.h | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/include/linux/mutex.h b/include/linux/mutex.h > index a33aa9eb9fc3..f3ae911580bf 100644 > --- a/include/linux/mutex.h > +++ b/include/linux/mutex.h > @@ -77,18 +77,10 @@ struct mutex { > }; > > #ifdef CONFIG_DEBUG_MUTEXES > - > -#define __DEBUG_MUTEX_INITIALIZER(lockname) \ > +# define __DEBUG_MUTEX_INITIALIZER(lockname) \ > , .magic = &lockname > - > -extern void mutex_destroy(struct mutex *lock); > - > #else > - > # define __DEBUG_MUTEX_INITIALIZER(lockname) > - > -static inline void mutex_destroy(struct mutex *lock) {} > - > #endif > > /** > @@ -151,9 +143,6 @@ struct mutex { > > 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) > > @@ -220,6 +209,16 @@ extern void mutex_unlock(struct mutex *lock); > > extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); > > +#ifdef CONFIG_DEBUG_MUTEXES > + > +extern void mutex_destroy(struct mutex *lock); > + > +#else > + > +static inline void mutex_destroy(struct mutex *lock) {} > + > +#endif > + > DEFINE_GUARD(mutex, struct mutex *, mutex_lock(_T), mutex_unlock(_T)) > DEFINE_FREE(mutex, struct mutex *, if (_T) mutex_unlock(_T)) >
-- Best regards George
| ![\](/images/icornerr.gif) |