diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-19 00:17:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-19 00:17:47 +0200 |
| commit | 624bbdfac99c50bf03dff9a0023f666b8e965627 (patch) | |
| tree | 431d1345087021736a2ae66b041d2a9593ebf1d3 /kernel/locking/rtmutex.c | |
| parent | 6f9aad0bc37286c0441b57f0ba8cffee50715426 (diff) | |
| parent | 887d9dc989eb0154492e41e7c07492edbb088ba1 (diff) | |
Merge branch 'timers/core' into sched/hrtimers
Merge sched/core and timers/core so we can apply the sched balancing
patch queue, which depends on both.
Diffstat (limited to 'kernel/locking/rtmutex.c')
| -rw-r--r-- | kernel/locking/rtmutex.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index b025295f4966..8b678cac7fbe 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1182,11 +1182,8 @@ 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_expires(&timeout->timer, HRTIMER_MODE_ABS); - if (!hrtimer_active(&timeout->timer)) - timeout->task = NULL; - } ret = task_blocks_on_rt_mutex(lock, &waiter, current, chwalk); |