summaryrefslogtreecommitdiff
path: root/kernel/rtmutex.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2008-02-13 14:45:36 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-02-13 14:45:36 (GMT)
commit720a2592cf1b9af86f30c44e8d89348826c03372 (patch)
tree491a01a3b915fee449a8454e5b8fd523a24d375e /kernel/rtmutex.c
parent96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff)
downloadlinux-3.10-720a2592cf1b9af86f30c44e8d89348826c03372.zip
linux-3.10-720a2592cf1b9af86f30c44e8d89348826c03372.tar.gz
linux-3.10-720a2592cf1b9af86f30c44e8d89348826c03372.tar.bz2
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 <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/rtmutex.c')
-rw-r--r--kernel/rtmutex.c5
1 files changed, 4 insertions, 1 deletions
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: */