aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-05-26 09:29:54 -0700
committerKevin Hilman <khilman@linaro.org>2015-05-26 09:29:54 -0700
commit536657195e2fb24484eac985302dc7a1e0093f5c (patch)
tree514b5d5637542b8d1ee00f9c4771603c7d80311e
parent5163bb7b0353fa83b8f85a2d7c0ddd348fb9514d (diff)
parent646fe96c67a5fcc2cfffb7326b2299f2714f7f27 (diff)
downloadlinux-linaro-stable-linux-linaro-lsk.tar.gz
Merge branch 'v3.10/topic/arm64-hmp' into linux-linaro-lsk-v3.10HEADlsk-v3.10-15.05linux-linaro-lsk
* v3.10/topic/arm64-hmp: arm64: topology: fix cpu power calculation
-rw-r--r--arch/arm64/kernel/topology.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index db8bb29..31e3e6e 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -317,16 +317,12 @@ static void __init parse_dt_cpu_power(void)
cpu_capacity(cpu) = capacity;
}
- /* If min and max capacities are equal we bypass the update of the
- * cpu_scale because all CPUs have the same capacity. Otherwise, we
- * compute a middle_capacity factor that will ensure that the capacity
+ /* compute a middle_capacity factor that will ensure that the capacity
* of an 'average' CPU of the system will be as close as possible to
* SCHED_POWER_SCALE, which is the default value, but with the
* constraint explained near table_efficiency[].
*/
- if (min_capacity == max_capacity)
- return;
- else if (4 * max_capacity < (3 * (max_capacity + min_capacity)))
+ if (4 * max_capacity < (3 * (max_capacity + min_capacity)))
middle_capacity = (min_capacity + max_capacity)
>> (SCHED_POWER_SHIFT+1);
else