diff options
| author | Dietmar Eggemann <dietmar.eggemann@arm.com> | 2014-12-02 14:06:29 +0000 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2014-12-03 15:54:07 +0100 |
| commit | b7a4d33c901c5ebd5621444bed01d39ff966bef8 (patch) | |
| tree | a90bf5d0bef933cb0f84ada5d0e8c7d9964cc794 /kernel/sched/fair.c | |
| parent | d3fc1d19920c15b6bc6c52d4ee841f7e663a8760 (diff) | |
sched: Get rid of scaling usage by cpu_capacity_orig
Since now we have besides frequency invariant also cpu (uarch plus max
system frequency) invariant cfs_rq::utilization_load_avg both, frequency
and cpu scaling happens as part of the load tracking.
So cfs_rq::utilization_load_avg does not have to be scaled by the original
capacity of the cpu again.
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d0d829a848f5..bfc50c46c1bb 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4600,12 +4600,11 @@ done: static int get_cpu_usage(int cpu) { unsigned long usage = cpu_rq(cpu)->cfs.utilization_load_avg; - unsigned long capacity = capacity_orig_of(cpu); if (usage >= SCHED_LOAD_SCALE) - return capacity; + return capacity_orig_of(cpu); - return (usage * capacity) >> SCHED_LOAD_SHIFT; + return usage; } /* |