diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2014-09-05 09:36:59 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2014-09-05 09:36:59 +0530 |
| commit | b78a9dffa19cfd6e5cef283c1b040b0429a0738e (patch) | |
| tree | d0687d7a412e1dba5305b9c2534d8add8dcee683 | |
| parent | c686f6627036ba65dbd4477eadb53dceac7643fb (diff) | |
hrtimer: make sure PINNED flag is cleared after removing hrtimer
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
| -rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 8c2930d1fa13..25bd820f8dc9 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -954,6 +954,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) */ state = timer->state & HRTIMER_STATE_CALLBACK; __remove_hrtimer(timer, base, state, reprogram); + timer->state &= ~HRTIMER_STATE_PINNED; return 1; } return 0; @@ -994,8 +995,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, timer_stats_hrtimer_set_start_info(timer); /* Update pinned state */ - timer->state &= ~HRTIMER_STATE_PINNED; - timer->state |= !!(mode & HRTIMER_MODE_PINNED) << HRTIMER_PINNED_SHIFT; + timer->state |= (!!(mode & HRTIMER_MODE_PINNED)) << HRTIMER_PINNED_SHIFT; leftmost = enqueue_hrtimer(timer, new_base); |