diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-02-10 18:21:04 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2017-06-07 19:03:33 -0400 |
| commit | a5ef347f188af434f90328e7c8bd8724882432ca (patch) | |
| tree | ae2e873104e9a684fe7322ea6fbe84fdfe819247 | |
| parent | 19d34a6b7523692d573c21fb9a100064741e2ed4 (diff) | |
| download | linux-rt-a5ef347f188af434f90328e7c8bd8724882432ca.tar.gz | |
rt: Drop mutex_disable() on !DEBUG configs and the GPL suffix from export symbol
Alex Goins reported that mutex_destroy() on RT will force a GPL only symbol
which won't link and therefore fail on a non-GPL kernel module.
This does not happen on !RT and is a regression on RT which we would like to
avoid.
I try here the easy thing and to not use rt_mutex_destroy() if
CONFIG_DEBUG_MUTEXES is not enabled. This will still break for the DEBUG
configs so instead of adding a wrapper around rt_mutex_destroy() (which we have
for rt_mutex_lock() for instance) I am simply dropping the GPL part from the
export.
Reported-by: Alex Goins <agoins@nvidia.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | include/linux/mutex_rt.h | 5 | ||||
| -rw-r--r-- | kernel/rtmutex.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h index c38a44b14da5..e0284edec655 100644 --- a/include/linux/mutex_rt.h +++ b/include/linux/mutex_rt.h @@ -43,7 +43,12 @@ extern void __lockfunc _mutex_unlock(struct mutex *lock); #define mutex_lock_killable(l) _mutex_lock_killable(l) #define mutex_trylock(l) _mutex_trylock(l) #define mutex_unlock(l) _mutex_unlock(l) + +#ifdef CONFIG_DEBUG_MUTEXES #define mutex_destroy(l) rt_mutex_destroy(&(l)->lock) +#else +static inline void mutex_destroy(struct mutex *lock) {} +#endif #ifdef CONFIG_DEBUG_LOCK_ALLOC # define mutex_lock_nested(l, s) _mutex_lock_nested(l, s) diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index 43d98d373809..63ac099b3b8d 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -2004,8 +2004,7 @@ void rt_mutex_destroy(struct rt_mutex *lock) lock->magic = NULL; #endif } - -EXPORT_SYMBOL_GPL(rt_mutex_destroy); +EXPORT_SYMBOL(rt_mutex_destroy); /** * __rt_mutex_init - initialize the rt lock |