aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDietmar Eggemann <dietmar.eggemann@arm.com>2017-09-26 12:41:13 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-02 20:37:54 -0400
commit552c4653bf89147c945bd676d28d4746c9500002 (patch)
treecd9440b5845a967df052b38b36daee314b595044
parent3a1ed9cfaf2849195886b80274008526ff2b5f02 (diff)
arm: wire cpu-invariant accounting support up to the task scheduler
Commit 8cd5601c5060 ("sched/fair: Convert arch_scale_cpu_capacity() from weak function to #define") changed the wiring which now has to be done by associating arch_scale_cpu_capacity with the actual implementation provided by the architecture. Define arch_scale_cpu_capacity to use the arch_topology "driver" function topology_get_cpu_scale() for the task scheduler's cpu-invariant accounting instead of the default arch_scale_cpu_capacity() in kernel/sched/sched.h. Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> Acked-by: Vincent Guittot <vincent.guittot@linaro.org> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Tested-by: Juri Lelli <juri.lelli@arm.com> Reviewed-by: Juri Lelli <juri.lelli@arm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/arm/include/asm/topology.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index a56a9e24f4c0..b713e7223bc4 100644
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h
@@ -29,6 +29,9 @@ const struct cpumask *cpu_coregroup_mask(int cpu);
29/* Replace task scheduler's default frequency-invariant accounting */ 29/* Replace task scheduler's default frequency-invariant accounting */
30#define arch_scale_freq_capacity topology_get_freq_scale 30#define arch_scale_freq_capacity topology_get_freq_scale
31 31
32/* Replace task scheduler's default cpu-invariant accounting */
33#define arch_scale_cpu_capacity topology_get_cpu_scale
34
32#else 35#else
33 36
34static inline void init_cpu_topology(void) { } 37static inline void init_cpu_topology(void) { }