Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc9684d3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

sched: deadline: Use hrtimer_start() 



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

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20150414203502.627353666@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4961b6e1

kernel/sched/deadline.c

+2 −10
Original line number Diff line number Diff line
@@ -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;

}



/*