From fcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6 Mon Sep 17 00:00:00 2001 From: Valentin Schneider Date: Wed, 29 Jul 2020 14:57:18 +0100 Subject: arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE Qian reported that the current setup forgoes the Kconfig dependencies and results in warnings such as: WARNING: unmet direct dependencies detected for SCHED_THERMAL_PRESSURE Depends on [n]: SMP [=y] && CPU_FREQ_THERMAL [=n] Selected by [y]: - ARM64 [=y] Revert commit e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE") and re-implement it by making the option default to 'y' for arm64 and arm, which respects Kconfig dependencies (i.e. will remain 'n' if CPU_FREQ_THERMAL=n). Fixes: e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE") Reported-by: Qian Cai Signed-off-by: Valentin Schneider Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20200729135718.1871-1-valentin.schneider@arm.com --- init/Kconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'init') diff --git a/init/Kconfig b/init/Kconfig index 0a97d85568b2..9f7f249dab43 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -493,6 +493,8 @@ config HAVE_SCHED_AVG_IRQ config SCHED_THERMAL_PRESSURE bool + default y if ARM && ARM_CPU_TOPOLOGY + default y if ARM64 depends on SMP depends on CPU_FREQ_THERMAL help -- cgit v1.2.3