Skip to contentSkip to conversation

lock debugging: loop nicer in mark_rt_mutex_waiters

PATCH New Thomas Gleixner 1 participant 1 message Jun 8, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lock debugging: loop nicer in mark_rt_mutex_waiters

From: Ingo Molnar <[email protected]>

Loop nicer in the mark_rt_mutex_waiters() busy loop.

Fix white space damage while at it.

kernel/rtmutex_common.h +6 -4
Index: linux-2.6.22-rc4/kernel/rtmutex_common.h
===================================================================
@@ -103,7 +103,7 @@ static inline struct task_struct *rt_mut
 
 static inline struct task_struct *rt_mutex_real_owner(struct rt_mutex *lock)
 {
- 	return (struct task_struct *)
+	return (struct task_struct *)
 		((unsigned long)lock->owner & ~RT_MUTEX_HAS_WAITERS);
 }
 
@@ -120,11 +120,13 @@ static inline unsigned long rt_mutex_own
 # define rt_mutex_cmpxchg(l,c,n)	(cmpxchg(&l->owner, c, n) == c)
 static inline void mark_rt_mutex_waiters(struct rt_mutex *lock)
 {
-	unsigned long owner, *p = (unsigned long *) &lock->owner;
+	unsigned long *p = (unsigned long *) &lock->owner;
+	unsigned long owner = *p;
 
-	do {
+	while (cmpxchg(p, owner, owner | RT_MUTEX_HAS_WAITERS) != owner) {
+		cpu_relax();
 		owner = *p;
-	} while (cmpxchg(p, owner, owner | RT_MUTEX_HAS_WAITERS) != owner);
+	}
 }
 #else
 # define rt_mutex_cmpxchg(l,c,n)	(0)