From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755748AbbBDOgb (ORCPT ); Wed, 4 Feb 2015 09:36:31 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38735 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755411AbbBDOg1 (ORCPT ); Wed, 4 Feb 2015 09:36:27 -0500 Date: Wed, 4 Feb 2015 06:35:52 -0800 From: tip-bot for Wanpeng Li Message-ID: Cc: ktkhai@parallels.com, wanpeng.li@linux.intel.com, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, juri.lelli@arm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: juri.lelli@arm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, wanpeng.li@linux.intel.com, torvalds@linux-foundation.org, ktkhai@parallels.com In-Reply-To: <1416962647-76792-7-git-send-email-wanpeng.li@linux.intel.com> References: <1416962647-76792-7-git-send-email-wanpeng.li@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched: Fix hrtick_start() on UP Git-Commit-ID: 868933359a3bdda25b562e9d41bce7071edc1b08 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: 868933359a3bdda25b562e9d41bce7071edc1b08 Gitweb: http://git.kernel.org/tip/868933359a3bdda25b562e9d41bce7071edc1b08 Author: Wanpeng Li AuthorDate: Wed, 26 Nov 2014 08:44:06 +0800 Committer: Ingo Molnar CommitDate: Wed, 4 Feb 2015 07:52:28 +0100 sched: Fix hrtick_start() on UP The commit 177ef2a6315e ("sched/deadline: Fix a precision problem in the microseconds range") forgot to change the UP version of hrtick_start(), do so now. Signed-off-by: Wanpeng Li Fixes: 177ef2a6315e ("sched/deadline: Fix a precision problem in the microseconds range") [ Fixed the changelog. ] Signed-off-by: Peter Zijlstra (Intel) Cc: Juri Lelli Cc: Kirill Tkhai Cc: Linus Torvalds Link: http://lkml.kernel.org/r/1416962647-76792-7-git-send-email-wanpeng.li@linux.intel.com Signed-off-by: Ingo Molnar --- kernel/sched/core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d59652d..5091fd4 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -492,6 +492,11 @@ static __init void init_hrtick(void) */ void hrtick_start(struct rq *rq, u64 delay) { + /* + * Don't schedule slices shorter than 10000ns, that just + * doesn't make sense. Rely on vruntime for fairness. + */ + delay = max_t(u64, delay, 10000LL); __hrtimer_start_range_ns(&rq->hrtick_timer, ns_to_ktime(delay), 0, HRTIMER_MODE_REL_PINNED, 0); }