From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753899AbbIWIrn (ORCPT ); Wed, 23 Sep 2015 04:47:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34963 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753386AbbIWIrk (ORCPT ); Wed, 23 Sep 2015 04:47:40 -0400 Date: Wed, 23 Sep 2015 01:46:56 -0700 From: tip-bot for Juri Lelli Message-ID: Cc: hpa@zytor.com, torvalds@linux-foundation.org, luca.abeni@unitn.it, efault@gmx.de, linux-kernel@vger.kernel.org, juri.lelli@arm.com, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org Reply-To: juri.lelli@arm.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, luca.abeni@unitn.it, efault@gmx.de In-Reply-To: <1441188096-23021-3-git-send-email-juri.lelli@arm.com> References: <1441188096-23021-3-git-send-email-juri.lelli@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/deadline: Unify dl_time_before() usage Git-Commit-ID: 2726d6ce389788c7fe724961a6e1bfe569560088 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: 2726d6ce389788c7fe724961a6e1bfe569560088 Gitweb: http://git.kernel.org/tip/2726d6ce389788c7fe724961a6e1bfe569560088 Author: Juri Lelli AuthorDate: Wed, 2 Sep 2015 11:01:34 +0100 Committer: Ingo Molnar CommitDate: Wed, 23 Sep 2015 09:51:25 +0200 sched/deadline: Unify dl_time_before() usage Move dl_time_before() static definition in include/linux/sched/deadline.h so that it can be used by different parties without being re-defined. Reported-by: Luca Abeni Signed-off-by: Juri Lelli Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1441188096-23021-3-git-send-email-juri.lelli@arm.com Signed-off-by: Ingo Molnar --- include/linux/sched/deadline.h | 5 +++++ kernel/sched/cpudeadline.c | 5 ----- kernel/sched/cpudeadline.h | 1 + kernel/sched/sched.h | 5 ----- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/include/linux/sched/deadline.h b/include/linux/sched/deadline.h index 9d303b8..9089a2a 100644 --- a/include/linux/sched/deadline.h +++ b/include/linux/sched/deadline.h @@ -21,4 +21,9 @@ static inline int dl_task(struct task_struct *p) return dl_prio(p->prio); } +static inline bool dl_time_before(u64 a, u64 b) +{ + return (s64)(a - b) < 0; +} + #endif /* _SCHED_DEADLINE_H */ diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c index c6acb07..5a75b08 100644 --- a/kernel/sched/cpudeadline.c +++ b/kernel/sched/cpudeadline.c @@ -31,11 +31,6 @@ static inline int right_child(int i) return (i << 1) + 2; } -static inline int dl_time_before(u64 a, u64 b) -{ - return (s64)(a - b) < 0; -} - static void cpudl_exchange(struct cpudl *cp, int a, int b) { int cpu_a = cp->elements[a].cpu, cpu_b = cp->elements[b].cpu; diff --git a/kernel/sched/cpudeadline.h b/kernel/sched/cpudeadline.h index 1a0a6ef..fcbdf83 100644 --- a/kernel/sched/cpudeadline.h +++ b/kernel/sched/cpudeadline.h @@ -2,6 +2,7 @@ #define _LINUX_CPUDL_H #include +#include #define IDX_INVALID -1 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3845a71..af6f252 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -118,11 +118,6 @@ static inline int task_has_dl_policy(struct task_struct *p) return dl_policy(p->policy); } -static inline bool dl_time_before(u64 a, u64 b) -{ - return (s64)(a - b) < 0; -} - /* * Tells if entity @a should preempt entity @b. */