Linux Headquarters - Kernel v2.6.25-rc7 /kernel/rtmutex.c

Kernel v2.6.25-rc7 /kernel/rtmutex.c

Filename:	/kernel/rtmutex.c
Lines Added:	4
Lines Deleted:	1
Also changed in:	(Previous) 2.6.25-rc6 2.6.25-rc5 2.6.25-rc4 2.6.25-rc3 2.6.25-rc2 2.6.25-rc1-git4 (Following) 2.6.25-rc8 2.6.25-rc9 2.6.25 2.6.27-git11 2.6.28-rc1 2.6.28-rc2

Location

2.6.25-rc7

kernel

rtmutex.c

Patch

diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 0deef71..6522ae5 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -630,9 +630,12 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
    set_current_state(state);
 
    /* Setup the timer, when timeout != NULL */
-   if (unlikely(timeout))
+   if (unlikely(timeout)) {
       hrtimer_start(&timeout->timer, timeout->timer.expires,
                HRTIMER_MODE_ABS);
+      if (!hrtimer_active(&timeout->timer))
+         timeout->task = NULL;
+   }
 
    for (;;) {
       /* Try to acquire the lock: */

Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.