Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25cea247 authored by Morten Rasmussen's avatar Morten Rasmussen Committed by Dmitry Shmidt
Browse files

ANDROID: 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: default avatarMorten Rasmussen <morten.rasmussen@arm.com>
Signed-off-by: default avatarAndres Oportus <andresoportus@google.com>
parent ea31a3e3

arch/arm/include/asm/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
 */

static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_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);

}