aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2014-06-23 11:39:09 +0100
committerJon Medhurst <tixy@linaro.org>2015-03-16 12:00:35 +0000
commit08b0c2234fdacb38050e76eddb291e4a479e68fb (patch)
tree7f37d9018bc7e01b5c381cdafe79c82d875122f4 /arch
parentbc911ae86f04f7fa07d63f1e3e8aee25dedbc418 (diff)
arm64: topology: Use new name for SCHED_POWER_SHIFT
Commit ca8ce3d0b1 (sched: Final power vs. capacity cleanups) renamed SCHED_POWER_SHIFT to SCHED_CAPACITY_SHIFT so we need to use that name. Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/topology.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index 45e805b357eb..417555806149 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -321,10 +321,10 @@ static void __init parse_dt_cpu_power(void)
return;
else if (4 * max_capacity < (3 * (max_capacity + min_capacity)))
middle_capacity = (min_capacity + max_capacity)
- >> (SCHED_POWER_SHIFT+1);
+ >> (SCHED_CAPACITY_SHIFT+1);
else
middle_capacity = ((max_capacity / 3)
- >> (SCHED_POWER_SHIFT-1)) + 1;
+ >> (SCHED_CAPACITY_SHIFT-1)) + 1;
}
/*
@@ -441,7 +441,7 @@ static void __init reset_cpu_power(void)
unsigned int cpu;
for_each_possible_cpu(cpu)
- set_power_scale(cpu, SCHED_POWER_SCALE);
+ set_power_scale(cpu, SCHED_CAPACITY_SCALE);
}
void __init init_cpu_topology(void)