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/sched/deadline.c | |
parent | 6f9aad0bc37286c0441b57f0ba8cffee50715426 (diff) | |
parent | 887d9dc989eb0154492e41e7c07492edbb088ba1 (diff) | |
download | linux-stable-624bbdfac99c50bf03dff9a0023f666b8e965627.tar.gz linux-stable-624bbdfac99c50bf03dff9a0023f666b8e965627.tar.bz2 linux-stable-624bbdfac99c50bf03dff9a0023f666b8e965627.zip |
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/sched/deadline.c')
-rw-r--r-- | kernel/sched/deadline.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 890ce951c717..7a08d590990e 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -503,8 +503,6 @@ static int start_dl_timer(struct sched_dl_entity *dl_se, bool boosted) struct dl_rq *dl_rq = dl_rq_of_se(dl_se); struct rq *rq = rq_of_dl_rq(dl_rq); ktime_t now, act; - ktime_t soft, hard; - unsigned long range; s64 delta; if (boosted) @@ -527,15 +525,9 @@ static int start_dl_timer(struct sched_dl_entity *dl_se, bool boosted) if (ktime_us_delta(act, now) < 0) return 0; - hrtimer_set_expires(&dl_se->dl_timer, act); + hrtimer_start(&dl_se->dl_timer, act, HRTIMER_MODE_ABS); - soft = hrtimer_get_softexpires(&dl_se->dl_timer); - hard = hrtimer_get_expires(&dl_se->dl_timer); - range = ktime_to_ns(ktime_sub(hard, soft)); - __hrtimer_start_range_ns(&dl_se->dl_timer, soft, - range, HRTIMER_MODE_ABS, 0); - - return hrtimer_active(&dl_se->dl_timer); + return 1; } /* |