Merge branch 'v3.10/topic/arm64-hmp' into linux-linaro-lsk-v3.10
* v3.10/topic/arm64-hmp:
arm64: topology: fix cpu power calculation
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 @@
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