From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966261AbbDVTMO (ORCPT ); Wed, 22 Apr 2015 15:12:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41558 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966236AbbDVTMJ (ORCPT ); Wed, 22 Apr 2015 15:12:09 -0400 Date: Wed, 22 Apr 2015 12:11:36 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: viresh.kumar@linaro.org, preeti@linux.vnet.ibm.com, mingo@kernel.org, mtosatti@redhat.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, mtosatti@redhat.com, mingo@kernel.org, preeti@linux.vnet.ibm.com, viresh.kumar@linaro.org In-Reply-To: <20150414203502.627353666@linutronix.de> References: <20150414203502.627353666@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] sched: deadline: Use hrtimer_start() Git-Commit-ID: cc9684d3c1188ac5f1cf0ee9f8be7ba456099d7b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cc9684d3c1188ac5f1cf0ee9f8be7ba456099d7b Gitweb: http://git.kernel.org/tip/cc9684d3c1188ac5f1cf0ee9f8be7ba456099d7b Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:09:06 +0000 Committer: Thomas Gleixner CommitDate: Wed, 22 Apr 2015 17:06:51 +0200 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: Thomas Gleixner Acked-by: Peter Zijlstra Cc: Preeti U Murthy Cc: Viresh Kumar Cc: Marcelo Tosatti Cc: Frederic Weisbecker Link: http://lkml.kernel.org/r/20150414203502.627353666@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/sched/deadline.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 5e95145..21d6907 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; } /*