arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
Subsystems (2)
PATCH 1/1 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).
--- arch/arm/Kconfig | 1 - arch/arm64/Kconfig | 1 - init/Kconfig | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/Kconfig +0 -1
@@ -47,7 +47,6 @@ config ARM select EDAC_ATOMIC_SCRUB select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY - select SCHED_THERMAL_PRESSURE if ARM_CPU_TOPOLOGY select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_AUTOPROBE
arch/arm64/Kconfig +0 -1
@@ -192,7 +192,6 @@ config ARM64 select PCI_SYSCALL if PCI select POWER_RESET select POWER_SUPPLY - select SCHED_THERMAL_PRESSURE select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE
init/Kconfig +2 -0
@@ -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
Signature · 1 line
2.27.0
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: fcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6 Gitweb: https://git.kernel.org/tip/fcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6 Author: Valentin Schneider <[email protected]> AuthorDate: Wed, 29 Jul 2020 14:57:18 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 29 Jul 2020 16:14:16 +02:00
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).
--- arch/arm/Kconfig | 1 - arch/arm64/Kconfig | 1 - init/Kconfig | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/Kconfig +0 -1
@@ -46,7 +46,6 @@ config ARM select EDAC_ATOMIC_SCRUB select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY - select SCHED_THERMAL_PRESSURE if ARM_CPU_TOPOLOGY select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_AUTOPROBE
arch/arm64/Kconfig +0 -1
@@ -192,7 +192,6 @@ config ARM64 select PCI_SYSCALL if PCI select POWER_RESET select POWER_SUPPLY - select SCHED_THERMAL_PRESSURE select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE
init/Kconfig +2 -0
@@ -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
Quoted 16 lines · Valentin Schneider
Qian reported that the current setup forgoes the
Kconfigdependencies 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: SelectCONFIG_SCHED_THERMAL_PRESSURE")and re-implement it by making the option default to 'y' for arm64 and arm, which respects
Kconfigdependencies (i.e. will remain 'n' if CPU_FREQ_THERMAL=n).
Quoted 8 lines
Fixes e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE")Reported-by Qian Cai <[email protected]>Signed-off-by Valentin Schneider <[email protected]>--- arch/arm/Kconfig | 1 - arch/arm64/Kconfig | 1 - init/Kconfig | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-)