Commit-ID: a8faa8f55d48496f64d96df48298e54fd380f6af Gitweb: http://git.kernel.org/tip/a8faa8f55d48496f64d96df48298e54fd380f6af Author: Vincent Guittot <vincent.guittot@xxxxxxxxxx> AuthorDate: Fri, 27 Feb 2015 16:54:06 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Fri, 27 Mar 2015 09:35:59 +0100 sched: Remove frequency scaling from cpu_capacity Now that arch_scale_cpu_capacity has been introduced to scale the original capacity, the arch_scale_freq_capacity is no longer used (it was previously used by ARM arch). Remove arch_scale_freq_capacity from the computation of cpu_capacity. The frequency invariance will be handled in the load tracking and not in the CPU capacity. arch_scale_freq_capacity will be revisited for scaling load with the current frequency of the CPUs in a later patch. Signed-off-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Acked-by: Morten Rasmussen <morten.rasmussen@xxxxxxx> Cc: Morten.Rasmussen@xxxxxxx Cc: dietmar.eggemann@xxxxxxx Cc: efault@xxxxxx Cc: kamalesh@xxxxxxxxxxxxxxxxxx Cc: linaro-kernel@xxxxxxxxxxxxxxxx Cc: nicolas.pitre@xxxxxxxxxx Cc: preeti@xxxxxxxxxxxxxxxxxx Cc: riel@xxxxxxxxxx Link: http://lkml.kernel.org/r/1425052454-25797-4-git-send-email-vincent.guittot@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- kernel/sched/fair.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d94a865..e54231f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6042,13 +6042,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) sdg->sgc->capacity_orig = capacity; - if (sched_feat(ARCH_CAPACITY)) - capacity *= arch_scale_freq_capacity(sd, cpu); - else - capacity *= default_scale_capacity(sd, cpu); - - capacity >>= SCHED_CAPACITY_SHIFT; - capacity *= scale_rt_capacity(cpu); capacity >>= SCHED_CAPACITY_SHIFT; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|