summaryrefslogtreecommitdiff
path: root/init/Kconfig
diff options
context:
space:
mode:
authorValentin Schneider <valentin.schneider@arm.com>2020-07-29 14:57:18 +0100
committerPeter Zijlstra <peterz@infradead.org>2020-07-29 16:14:16 +0200
commitfcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6 (patch)
tree24252ac0aa19a9ba77525cda06d45e8f1cc854cf /init/Kconfig
parent1f73d1abe5836bd8ffe747ff5cb7561b17ce5bc6 (diff)
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 <cai@lca.pw> Signed-off-by: Valentin Schneider <valentin.schneider@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20200729135718.1871-1-valentin.schneider@arm.com
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig2
1 files changed, 2 insertions, 0 deletions
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