[PATCH RT] mutex_init regression from 2.6.29.6-rt24

[Frank Rowand <frank.rowand@xxxxxxxxxxx>]

Fix regression of mutex_init() between 2.6.29.6-rt24 and 3.2.12-rt22
(regression exists in all 3.x versions).

In 2.6.29.6-rt24, with CONFIG_PREEMPT_RT, mutex_init() is a define that
resolves to the function __mutex_init(), which is EXPORT_SYMBOL.
__mutex_init() further calls __rt_mutex_init(), which is EXPORT_SYMBOL_GPL.

In 3.2.12-rt22, with CONFIG_PREEMPT_RT_FULL, mutex_init() is a define that
resolves to the function __rt_mutex_init(), which is EXPORT_SYMBOL_GPL.

Recreate an intermediary function (___rt_mutex_init()), which is
EXPORT_SYMBOL(), to make mutex_init() once again available to non-GPL modules.

Making this change without the 2.6.29.6-rt24 context would not be reasonable.
But the author of the EXPORT_SYMBOL_GPL, __rt_mutex_init(), is also the
author of the 2.6.29.6-rt24 patches that created the EXPORT_SYMBOL function
__mutex_init().  The patches are rt-mutex-core.patch which creates
_mutex_init(), and rt-mutex-core-mutex-fixes.patch, which renames
_mutex_init() to __mutex_init().  The author and signed-off-by for these
patches is Ingo Molnar.

The full expansions from mutex_init() to __mutex_init() is:

# 2.6.29.6-rt24
# include/linux/mutex.h:
# define mutex_init(mutex) __mutex_init((mutex), #mutex, &__key);
   # kernel/rt.c:
   void __mutex_init(...) {
      __rt_mutex_init()
         # kernel/rtmutex.c:
         void __rt_mutex_init(...) {
         EXPORT_SYMBOL_GPL(__rt_mutex_init)

# 3.0.12-rt29
# include/linux/mutex_rt.h:
# define mutex_init(mutex) rt_mutex_init(&(mutex)->lock);
   # include/linux/rtmutex.h:
   # define rt_mutex_init(mutex) __rt_mutex_init(mutex, #mutex);
      # kernel/rtmutex.c:
      void __rt_mutex_init() {
      EXPORT_SYMBOL_GPL(__rt_mutex_init)

Signed-off-by: Frank Rowand <frank.rowand@xxxxxxxxxxx>

---
 include/linux/rtmutex.h |    5 	3 +	2 -	0 !
 kernel/rt.c             |    6 	6 +	0 -	0 !
 2 files changed, 9 insertions(+), 2 deletions(-)

Index: b/include/linux/rtmutex.h
===================================================================
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -61,7 +61,7 @@ struct hrtimer_sleeper;
 # define rt_mutex_init(mutex)					\
 	do {							\
 		raw_spin_lock_init(&(mutex)->wait_lock);	\
-		__rt_mutex_init(mutex, #mutex);			\
+		___rt_mutex_init(mutex, #mutex);			\
 	} while (0)
 
  extern void rt_mutex_debug_task_free(struct task_struct *tsk);
@@ -71,7 +71,7 @@ struct hrtimer_sleeper;
 # define rt_mutex_init(mutex)					\
 	do {							\
 		raw_spin_lock_init(&(mutex)->wait_lock);	\
-		__rt_mutex_init(mutex, #mutex);			\
+		___rt_mutex_init(mutex, #mutex);			\
 	} while (0)
 
 # define rt_mutex_debug_task_free(t)			do { } while (0)
@@ -105,6 +105,7 @@ static inline int rt_mutex_is_locked(str
 	return lock->owner != NULL;
 }
 
+extern void ___rt_mutex_init(struct rt_mutex *lock, const char *name);
 extern void __rt_mutex_init(struct rt_mutex *lock, const char *name);
 extern void rt_mutex_destroy(struct rt_mutex *lock);
 
Index: b/kernel/rt.c
===================================================================
--- a/kernel/rt.c
+++ b/kernel/rt.c
@@ -72,6 +72,12 @@
 /*
  * struct mutex functions
  */
+void ___rt_mutex_init(struct rt_mutex *lock, const char *name)
+{
+	__rt_mutex_init(lock, name);
+}
+EXPORT_SYMBOL(___rt_mutex_init);
+
 void __mutex_do_init(struct mutex *mutex, const char *name,
 		     struct lock_class_key *key)
 {

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html