aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Guittot <vincent.guittot@linaro.org>2014-10-20 11:20:57 +0200
committerVincent Guittot <vincent.guittot@linaro.org>2014-11-20 09:38:05 +0100
commit2ebc49b60fda8133d934e0d9fed57a25b259bdbd (patch)
treeac3382d22c0cd423f76f0acb3559ac4b1867d767
parent84ca9a71fa8a56519e7bc1d930031096d14b6e06 (diff)
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@linaro.org>
-rw-r--r--kernel/sched/fair.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index b509b082c61c..88bc3facaddc 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6026,13 +6026,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;