From abdcda318be2337a46f118ffda2d377c95c12408 Mon Sep 17 00:00:00 2001 From: Juri Lelli <juri.lelli@arm.com> Date: Fri, 20 Nov 2015 11:47:48 +0000 Subject: [PATCH 38/92] arm64: Wire cpu-invariant load-tracking support up to the scheduler Define arch_scale_cpu_capacity to use the arch-specific function scale_cpu_capacity(). Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Juri Lelli <juri.lelli@arm.com> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> (cherry picked from commit 94ad9dbcfe547eeed8115fab9f114be0d0487bd8) Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com> --- arch/arm64/include/asm/topology.h | 4 ++++ arch/arm64/kernel/topology.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 8b57339..5d576eb 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -32,6 +32,10 @@ struct cpu_topology { #endif /* CONFIG_NUMA */ +struct sched_domain; +#define arch_scale_cpu_capacity scale_cpu_capacity +extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu); + #include <asm-generic/topology.h> #endif /* _ASM_ARM_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index cff34cc..91de9dd 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -28,7 +28,7 @@ static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE; static DEFINE_MUTEX(cpu_scale_mutex); -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); } -- 1.9.1