sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux515/516: Project C: Port the /init/Kconfig changes over from the 5.17.2 fix.

Browse Source
This commit is contained in:
Tk-Glitch
2022-04-09 19:12:22 +02:00
parent 18dacf66de
commit cf590f8d8d
3 changed files with 155 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKGBUILD
View File

@@ -59,7 +59,7 @@ else
fi fi
pkgname=("${pkgbase}" "${pkgbase}-headers") pkgname=("${pkgbase}" "${pkgbase}-headers")
pkgver="${_basekernel}"."${_sub}" pkgver="${_basekernel}"."${_sub}"
pkgrel=253 pkgrel=254
pkgdesc='Linux-tkg' pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here arch=('x86_64') # no i686 in here
url="http://www.kernel.org/" url="http://www.kernel.org/"
@@ -629,7 +629,7 @@ case $_basever in
'68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e' '68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc' '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc'
'4286b99beb5683b4eb7dd7cc2edb351ce9e8ca20f7eb81dec374c70d0deb6287' '930996cdd9b63e3456cc49da4015631717c1c2ec41f879b25a9100e95e0b38fb'
'4499b55ed1c0b9527feba77160f6f244c93dfed417d04e0ba88a077a8140b281' '4499b55ed1c0b9527feba77160f6f244c93dfed417d04e0ba88a077a8140b281'
'434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d' '434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d'
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
@@ -681,7 +681,7 @@ case $_basever in
'44a46815d26170e43dd5f21e352081c8e5a4816512abb86353a1d90311fffcde' '44a46815d26170e43dd5f21e352081c8e5a4816512abb86353a1d90311fffcde'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'2a7877d24f21d3cdd8452b78160caf574d6cb8ae8c3b74e9f83e3d77907d1455' '43d72770c784c017af6dd8bb5bbb31d9c5e7ec992c860a68222dfb45ba288f7b'
#'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c'
'1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'

77
linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch
View File

@@ -9793,6 +9793,82 @@ index adf7ef194005..11c8f36e281b 100644
}; };
struct wakeup_test_data *x = data; 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/alt_sched.h b/kernel/sched/alt_sched.h diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644 index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644
--- a/kernel/sched/alt_sched.h --- a/kernel/sched/alt_sched.h
@@ -9817,4 +9893,3 @@ index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646
+ +
extern void swake_up_all_locked(struct swait_queue_head *q); 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); extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);

77
linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch
View File

@@ -9850,6 +9850,82 @@ index abcadbe933bb..d4c778b0ab0e 100644
}; };
struct wakeup_test_data *x = data; 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 diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index e5a7a638f3fbe0f40f9b0be709ccbd02039d6d3b..163cec668095133a3f1d34df462cc7b8260504be 100644 index e5a7a638f3fbe0f40f9b0be709ccbd02039d6d3b..163cec668095133a3f1d34df462cc7b8260504be 100644
--- a/kernel/sched/topology.c --- 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 swake_up_all_locked(struct swait_queue_head *q);
extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait); extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);