linux58-tkg: Merge 40b9dc8708
Fixes f89af1cbb4b60b4b6437f30fc8c7ff0e39271bad
This commit is contained in:
parent
f89af1cbb4
commit
cce2723e11
@ -95,7 +95,7 @@ sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
|
||||
'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
|
||||
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
||||
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
|
||||
'548c5f7ab1a72a97abd4c1c6420e10b2f1e6442176f5f10526254b15024aaca6'
|
||||
'5d77fae7fd9955b8e057d67ce51bc5a019dee46d003fe7b44dd9a131b01b6abc'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'98311deeb474b39e821cd1e64198793d5c4d797155b3b8bbcb1938b7f11e8d74')
|
||||
|
||||
|
@ -8570,3 +8570,43 @@ index 45f0b0f3616c934a3bfa43d0f2ba998c6f006dba..179d77c8360ebdd795a5bb9d2b046232
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SCHED_PDS
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index 09a302641ba67bc0dd6223d240c7172e808abe42..aaa7c434eedfc5bce8c331926d0fab14c58ca007 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -774,7 +774,7 @@ endif
|
||||
config UCLAMP_TASK
|
||||
bool "Enable utilization clamping for RT/FAIR tasks"
|
||||
depends on CPU_FREQ_GOV_SCHEDUTIL
|
||||
- depends on !SCHED_BMQ
|
||||
+ depends on !SCHED_ALT
|
||||
help
|
||||
This feature enables the scheduler to track the clamped utilization
|
||||
of each CPU based on RUNNABLE tasks scheduled on that CPU.
|
||||
@@ -860,7 +860,7 @@ config NUMA_BALANCING
|
||||
depends on ARCH_SUPPORTS_NUMA_BALANCING
|
||||
depends on !ARCH_WANT_NUMA_VARIABLE_LOCALITY
|
||||
depends on SMP && NUMA && MIGRATION
|
||||
- depends on !SCHED_BMQ
|
||||
+ depends on !SCHED_ALT
|
||||
help
|
||||
This option adds support for automatic NUMA aware memory/task placement.
|
||||
The mechanism is quite primitive and is based on migrating memory when
|
||||
@@ -947,7 +947,7 @@ menuconfig CGROUP_SCHED
|
||||
bandwidth allocation to such task groups. It uses cgroups to group
|
||||
tasks.
|
||||
|
||||
-if CGROUP_SCHED && !SCHED_BMQ
|
||||
+if CGROUP_SCHED && !SCHED_ALT
|
||||
config FAIR_GROUP_SCHED
|
||||
bool "Group scheduling for SCHED_OTHER"
|
||||
depends on CGROUP_SCHED
|
||||
@@ -1203,7 +1203,7 @@ config CHECKPOINT_RESTORE
|
||||
|
||||
config SCHED_AUTOGROUP
|
||||
bool "Automatic process group scheduling"
|
||||
- depends on !SCHED_BMQ
|
||||
+ depends on !SCHED_ALT
|
||||
select CGROUPS
|
||||
select CGROUP_SCHED
|
||||
select FAIR_GROUP_SCHED
|
||||
|
Loading…
x
Reference in New Issue
Block a user