The following commit has been merged into the sched/core branch of tip: Commit-ID: 844eb6458facb09d4871a480d8bda06550927a80 Gitweb: https://git.kernel.org/tip/844eb6458facb09d4871a480d8bda06550927a80 Author: Dietmar Eggemann <dietmar.eggemann@xxxxxxx> AuthorDate: Wed, 03 Jun 2020 10:03:01 +02:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Mon, 15 Jun 2020 14:10:01 +02:00 sched/pelt: Remove redundant cap_scale() definition Besides in PELT cap_scale() is used in the Deadline scheduler class for scale-invariant bandwidth enforcement. Remove the cap_scale() definition in kernel/sched/pelt.c and keep the one in kernel/sched/sched.h. Signed-off-by: Dietmar Eggemann <dietmar.eggemann@xxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200603080304.16548-2-dietmar.eggemann@xxxxxxx --- kernel/sched/pelt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c index b4b1ff9..dea5567 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -83,8 +83,6 @@ static u32 __accumulate_pelt_segments(u64 periods, u32 d1, u32 d3) return c1 + c2 + c3; } -#define cap_scale(v, s) ((v)*(s) >> SCHED_CAPACITY_SHIFT) - /* * Accumulate the three separate parts of the sum; d1 the remainder * of the last (incomplete) period, d2 the span of full periods and d3
|