arch_topology, sched/core: Cleanup thermal pressure definition
authorValentin Schneider <valentin.schneider@arm.com>
Sun, 12 Jul 2020 16:59:15 +0000 (17:59 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 22 Jul 2020 08:22:05 +0000 (10:22 +0200)
commit25980c7a79af42f2daa73e2f475ebf4cbac8253e
treee22a255eca9698525da7ea6e9de531bfefcf1f6b
parent2705937a0395bd15d515a2a302d26ebc8318c035
arch_topology, sched/core: Cleanup thermal pressure definition

The following commit:

  14533a16c46d ("thermal/cpu-cooling, sched/core: Move the arch_set_thermal_pressure() API to generic scheduler code")

moved the definition of arch_set_thermal_pressure() to sched/core.c, but
kept its declaration in linux/arch_topology.h. When building e.g. an x86
kernel with CONFIG_SCHED_THERMAL_PRESSURE=y, cpufreq_cooling.c ends up
getting the declaration of arch_set_thermal_pressure() from
include/linux/arch_topology.h, which is somewhat awkward.

On top of this, sched/core.c unconditionally defines
o The thermal_pressure percpu variable
o arch_set_thermal_pressure()

while arch_scale_thermal_pressure() does nothing unless redefined by the
architecture.

arch_*() functions are meant to be defined by architectures, so revert the
aforementioned commit and re-implement it in a way that keeps
arch_set_thermal_pressure() architecture-definable, and doesn't define the
thermal pressure percpu variable for kernels that don't need
it (CONFIG_SCHED_THERMAL_PRESSURE=n).

Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200712165917.9168-2-valentin.schneider@arm.com
arch/arm/include/asm/topology.h
arch/arm64/include/asm/topology.h
drivers/base/arch_topology.c
include/linux/arch_topology.h
include/linux/sched/topology.h
kernel/sched/core.c