From: Morten Rasmussen <morten.rasmussen@arm.com>
Date: Tue, 14 Apr 2015 15:25:31 +0000 (+0100)
Subject: arm: Update arch_scale_cpu_capacity() to reflect change to define
X-Git-Tag: firefly_0821_release~176^2~297
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=49e029d7a7355ee5d44bbb906606c08cb4133ba3;p=firefly-linux-kernel-4.4.55.git

arm: Update arch_scale_cpu_capacity() to reflect change to define

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>
---

diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index a69917b7d2c9..e3e596cbb1a7 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 08b7847bf912..614554765e44 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);
 }