Re: [patch 0/3] [-rt] Fixes the timeout-bug in the rtmutex/PI-futex.

[Ingo Molnar <mingo@elte.hu>]

* Ingo Molnar <mingo@elte.hu> wrote:

> 
> * Esben Nielsen <nielsen.esben@googlemail.com> wrote:
> 
> > -- Hi,
> >  I finally got around to send in the a new version of my fixes to PI. 
> >  The main purpose is to fix the timeout bug of the rtmutex/PI-futex. 
> 
> there's quite a bit of whitespace damage in your patchqueue. For 
> example all the 'context' lines have an extra space at their 
> beginning, which causes 'patch' to fail on every single chunk. There's 
> also the occasional '8 spaces instead of a tab' buglet, probably 
> introduced while writing this code.

and i also had to do the fixes below to get it to build.

	Ingo

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

Index: linux-rt.q/include/linux/rtmutex.h
===================================================================
--- linux-rt.q.orig/include/linux/rtmutex.h
+++ linux-rt.q/include/linux/rtmutex.h
@@ -116,7 +116,7 @@ extern void rt_mutex_unlock(struct rt_mu
 # define INIT_RT_MUTEXES(tsk)						\
 	.pi_waiters	= PLIST_HEAD_INIT(tsk.pi_waiters, tsk.pi_lock),	\
 	.pi_lock	= RAW_SPIN_LOCK_UNLOCKED,			\
-	.boosting_prio	= MAX_PRIO					\
+	.boosting_prio	= MAX_PRIO,					\
 	INIT_RT_MUTEX_DEBUG(tsk)
 #else
 # define INIT_RT_MUTEXES(tsk)
Index: linux-rt.q/kernel/rtmutex.c
===================================================================
--- linux-rt.q.orig/kernel/rtmutex.c
+++ linux-rt.q/kernel/rtmutex.c
@@ -328,7 +328,7 @@ static int rt_mutex_adjust_prio_chain(ta
  * Calls the rt_mutex_adjust_prio_chain() above
  * whith unlocking and locking lock->wait_lock.
  */
-static void rt_mutex_adjust_prio_chain_unlock(struct rt_mutex *lock)
+static void rt_mutex_adjust_prio_chain_unlock(struct rt_mutex *lock __IP_DECL__)
 {
 	spin_unlock(&lock->wait_lock);
 	get_task_struct(current);
@@ -714,7 +714,7 @@ rt_lock_slowlock(struct rt_mutex *lock _
 			task_blocks_on_rt_mutex(lock, &waiter, 0 __IP__);
 			/* Wakeup during boost ? */
 		else
-			rt_mutex_adjust_prio_chain_unlock(lock);
+			rt_mutex_adjust_prio_chain_unlock(lock __IP__);
 
 		/*
 		 * We got it while lock->wait_lock was unlocked ?
@@ -914,7 +914,7 @@ rt_mutex_slowlock(struct rt_mutex *lock,
 			ret = task_blocks_on_rt_mutex(lock, &waiter,
 						      detect_deadlock __IP__);
 		else
-			rt_mutex_adjust_prio_chain_unlock(lock);
+			rt_mutex_adjust_prio_chain_unlock(lock __IP__);
 
 
 		/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/