|
|
|
|
@ -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
|
|
|
|
|
|
Tk-Glitch