diff options
| author | Morten Rasmussen <morten.rasmussen@arm.com> | 2015-04-14 16:25:31 +0100 |
|---|---|---|
| committer | Steve Muckle <smuckle@linaro.org> | 2016-02-22 17:36:14 -0800 |
| commit | f1156cfc6694d7bcb3641413d63eb85e5965c7fe (patch) | |
| tree | f7b96ae7f1e36668643b2d2aaff97cb2c447a0e5 | |
| parent | 176a4c9d8d445bbf4be9e0aae00cfe6713d62253 (diff) | |
| download | linux-sched-freq-rfcv7.tar.gz | |
arm: Update arch_scale_cpu_capacity() to reflect change to definesched-freq-rfcv7
arch_scale_cpu_capacity() is no longer a weak function but a #define
instead. Include the #define in topology.h.
cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com>
| -rw-r--r-- | arch/arm/include/asm/topology.h | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/topology.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h index a69917b7d2c94..e3e596cbb1a74 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -28,6 +28,8 @@ const struct cpumask *cpu_coregroup_mask(int cpu); #include <linux/cpufreq.h> #define arch_scale_freq_capacity cpufreq_scale_freq_capacity #endif +#define arch_scale_cpu_capacity scale_cpu_capacity +extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu); #else diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 08b7847bf9124..614554765e447 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -42,7 +42,7 @@ */ static DEFINE_PER_CPU(unsigned long, cpu_scale); -unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) +unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu) { return per_cpu(cpu_scale, cpu); } |