From: Peter Zijlstra Date: Wed, 13 Feb 2008 14:45:36 +0000 (+0100) Subject: hrtimer: more hrtimer_init_sleeper() fallout. X-Git-Tag: v2.6.25-rc2~73^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=720a2592cf1b9af86f30c44e8d89348826c03372;p=linux-2.6-omap-h63xx.git hrtimer: more hrtimer_init_sleeper() fallout. Missed an instance... futex_lock_pi() hrtimer_init_sleeper() rt_mutex_timed_lock() rt_mutex_timed_fastlock() rt_mutex_slowlock() hrtimer_start() Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar --- diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index 0deef71ff8d..6522ae5b14a 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: */