1 files changed, 59 insertions, 0 deletions
diff --git a/features/rt/locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch b/features/rt/locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch
new file mode 100644
index 00000000..61fe6760
--- /dev/null
+++ b/features/rt/locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch
@@ -0,0 +1,59 @@
+From d3f167aba99034929675a15535bcbd7deccf97bc Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 29 Sep 2020 16:32:49 +0200
+Subject: [PATCH 063/191] locking/rtmutex: Move rt_mutex_init() outside of
+ CONFIG_DEBUG_RT_MUTEXES
+
+rt_mutex_init() only initializes lockdep if CONFIG_DEBUG_RT_MUTEXES is
+enabled. The static initializer (DEFINE_RT_MUTEX) does not have such a
+restriction.
+
+Move rt_mutex_init() outside of CONFIG_DEBUG_RT_MUTEXES.
+Move the remaining functions in this CONFIG_DEBUG_RT_MUTEXES block to
+the upper block.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/rtmutex.h | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
+index 88a0ba806066..2dc10b582d4a 100644
+--- a/include/linux/rtmutex.h
++++ b/include/linux/rtmutex.h
+@@ -43,6 +43,7 @@ struct hrtimer_sleeper;
+  extern int rt_mutex_debug_check_no_locks_freed(const void *from,
+ 						unsigned long len);
+  extern void rt_mutex_debug_check_no_locks_held(struct task_struct *task);
++ extern void rt_mutex_debug_task_free(struct task_struct *tsk);
+ #else
+  static inline int rt_mutex_debug_check_no_locks_freed(const void *from,
+ 						       unsigned long len)
+@@ -50,22 +51,15 @@ struct hrtimer_sleeper;
+ 	return 0;
+  }
+ # define rt_mutex_debug_check_no_locks_held(task)	do { } while (0)
++# define rt_mutex_debug_task_free(t)			do { } while (0)
+ #endif
+ 
+-#ifdef CONFIG_DEBUG_RT_MUTEXES
+-
+-# define rt_mutex_init(mutex) \
++#define rt_mutex_init(mutex) \
+ do { \
+ 	static struct lock_class_key __key; \
+ 	__rt_mutex_init(mutex, __func__, &__key); \
+ } while (0)
+ 
+- extern void rt_mutex_debug_task_free(struct task_struct *tsk);
+-#else
+-# define rt_mutex_init(mutex)			__rt_mutex_init(mutex, NULL, NULL)
+-# define rt_mutex_debug_task_free(t)			do { } while (0)
+-#endif
+-
+ #ifdef CONFIG_DEBUG_LOCK_ALLOC
+ #define __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname) \
+ 	, .dep_map = { .name = #mutexname }
+-- 
+2.19.1
+