linux515/516: Project C: Port the /init/Kconfig changes over from the 5.17.2 fix.
This commit is contained in:
@@ -9850,6 +9850,82 @@ 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
|
||||
@@ -9887,4 +9963,3 @@ index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646
|
||||
+
|
||||
extern void swake_up_all_locked(struct swait_queue_head *q);
|
||||
extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
|
||||
|
||||
|
Reference in New Issue
Block a user