Tk-Glitch
2022-04-04 22:44:37 +02:00
parent e2d0ff4d6a
commit 30be4c4bc5
2 changed files with 91 additions and 2 deletions

View File

@@ -9853,3 +9853,92 @@ index abcadbe933bb..d4c778b0ab0e 100644
};
struct wakeup_test_data *x = data;
diff --git a/init/Kconfig b/init/Kconfig
index 6be3308a3665af9e932db6639e4e22adec1dd9c9..2213c306065ea9e46061da4ad3c901183ee13f78 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -814,35 +814,6 @@ config GENERIC_SCHED_CLOCK
menu "Scheduler features"
-menuconfig SCHED_ALT
- bool "Alternative CPU Schedulers"
- default y
- help
- This feature enable alternative CPU scheduler"
-
-if SCHED_ALT
-
-choice
- prompt "Alternative CPU Scheduler"
- default SCHED_BMQ
-
-config SCHED_BMQ
- bool "BMQ CPU scheduler"
- help
- The BitMap Queue CPU scheduler for excellent interactivity and
- responsiveness on the desktop and solid scalability on normal
- hardware and commodity servers.
-
-config SCHED_PDS
- bool "PDS CPU scheduler"
- help
- The Priority and Deadline based Skip list multiple queue CPU
- Scheduler.
-
-endchoice
-
-endif
-
config UCLAMP_TASK
bool "Enable utilization clamping for RT/FAIR tasks"
depends on CPU_FREQ_GOV_SCHEDUTIL
@@ -893,6 +864,35 @@ config UCLAMP_BUCKETS_COUNT
If in doubt, use the default value.
+menuconfig SCHED_ALT
+ bool "Alternative CPU Schedulers"
+ default y
+ help
+ This feature enable alternative CPU scheduler"
+
+if SCHED_ALT
+
+choice
+ prompt "Alternative CPU Scheduler"
+ default SCHED_BMQ
+
+config SCHED_BMQ
+ bool "BMQ CPU scheduler"
+ help
+ The BitMap Queue CPU scheduler for excellent interactivity and
+ responsiveness on the desktop and solid scalability on normal
+ hardware and commodity servers.
+
+config SCHED_PDS
+ bool "PDS CPU scheduler"
+ help
+ The Priority and Deadline based Skip list multiple queue CPU
+ Scheduler.
+
+endchoice
+
+endif
+
endmenu
#
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index e5a7a638f3fbe0f40f9b0be709ccbd02039d6d3b..163cec668095133a3f1d34df462cc7b8260504be 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2542,8 +2542,6 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
{}
#ifdef CONFIG_NUMA
-int __read_mostly node_reclaim_distance = RECLAIM_DISTANCE;
-
int sched_numa_find_closest(const struct cpumask *cpus, int cpu)
{
return best_mask_cpu(cpu, cpus);