diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2008-02-13 15:45:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-13 15:45:36 +0100 |
| commit | 720a2592cf1b9af86f30c44e8d89348826c03372 (patch) | |
| tree | 491a01a3b915fee449a8454e5b8fd523a24d375e /kernel | |
| parent | WMI: initialize wmi_blocks.list even if ACPI is disabled (diff) | |
| download | linux-720a2592cf1b9af86f30c44e8d89348826c03372.tar.xz linux-720a2592cf1b9af86f30c44e8d89348826c03372.zip | |
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')
| -rw-r--r-- | kernel/rtmutex.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index 0deef71ff8d2..6522ae5b14a2 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: */ |