Fix plist initialisation for CONFIG_DEBUG_PI_LIST

PATCH New Jan Kiszka 1 participant 1 message Oct 26, 2007

Share & tools

Jan Kiszka

author

2007-10-26 16:06 UTC #0 lore raw

PATCH 1/1 Fix plist initialisation for CONFIG_DEBUG_PI_LIST

PLIST_NODE_INIT (once used, only in -rt ATM) will fail when CONFIG_DEBUG_PI_LIST is enabled as it then generates a &NULL statement. This patch fixes the issue indirectly by turning the _lock argument of PLIST_HEAD_INIT into a pointer and adopting its users.

Signed-off-by Jan Kiszka <[email protected]>

---
 include/linux/plist.h   |    4 ++--
 include/linux/rtmutex.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

include/linux/plist.h +2 -2

Index: linux-2.6.23.1-rt/include/linux/plist.h
===================================================================
@@ -99,13 +99,13 @@ struct plist_node {
 /**
  * PLIST_HEAD_INIT - static struct plist_head initializer
  * @head:	struct plist_head variable name
- * @_lock:	lock to initialize for this list
+ * @_lock:	lock * to initialize for this list
  */
 #define PLIST_HEAD_INIT(head, _lock)			\
 {							\
 	.prio_list = LIST_HEAD_INIT((head).prio_list),	\
 	.node_list = LIST_HEAD_INIT((head).node_list),	\
-	PLIST_HEAD_LOCK_INIT(&(_lock))			\
+	PLIST_HEAD_LOCK_INIT(_lock)			\
 }
 
 /**

include/linux/rtmutex.h +2 -2

Index: linux-2.6.23.1-rt/include/linux/rtmutex.h
===================================================================
@@ -64,7 +64,7 @@ struct hrtimer_sleeper;
 
 #define __RT_MUTEX_INITIALIZER(mutexname) \
 	{ .wait_lock = RAW_SPIN_LOCK_UNLOCKED(mutexname) \
-	, .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
+	, .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, &mutexname.wait_lock) \
 	, .owner = NULL \
 	__DEBUG_RT_MUTEX_INITIALIZER(mutexname)}

@@ -98,7 +98,7 @@ extern void rt_mutex_unlock(struct rt_mu
 
 #ifdef CONFIG_RT_MUTEXES
 # define INIT_RT_MUTEXES(tsk)						\
-	.pi_waiters	= PLIST_HEAD_INIT(tsk.pi_waiters, tsk.pi_lock),	\
+	.pi_waiters = PLIST_HEAD_INIT(tsk.pi_waiters, &tsk.pi_lock),	\
 	INIT_RT_MUTEX_DEBUG(tsk)
 #else
 # define INIT_RT_MUTEXES(tsk)