[patch 25/39] sched: deadline: Use hrtimer_start()

From: Thomas Gleixner
Date: Tue Apr 14 2015 - 17:10:09 EST


hrtimer_start() does not longer defer already expired timers to the
softirq. Get rid of the __hrtimer_start_range_ns() invocation.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
kernel/sched/deadline.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

Index: tip/kernel/sched/deadline.c
===================================================================
--- tip.orig/kernel/sched/deadline.c
+++ tip/kernel/sched/deadline.c
@@ -457,8 +457,6 @@ static int start_dl_timer(struct sched_d
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)
@@ -481,15 +479,9 @@ static int start_dl_timer(struct sched_d
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;
}

/*


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/