From 30be4c4bc586f2253a040112c2241db42c8d577e Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 4 Apr 2022 22:44:37 +0200 Subject: [PATCH] linux517: Fix Project C compilation https://gitlab.com/alfredchen/linux-prjc/-/issues/54 https://gitlab.com/alfredchen/linux-prjc/-/issues/55 --- PKGBUILD | 4 +- .../5.17/0009-prjc_v5.17-r0.patch | 89 +++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index ca1f081..f5a17f0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -59,7 +59,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=251 +pkgrel=252 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -733,7 +733,7 @@ case $_basever in 'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' - 'c62c73dac6bdb437b1b8e2153b10437fd6924bffca7cff2f8f3eb145e555d9d5' + '95fd78b725360742ead8c55eea7e3ff7ac8ae11ae1a21a0d881e168a841bc9b4' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' diff --git a/linux-tkg-patches/5.17/0009-prjc_v5.17-r0.patch b/linux-tkg-patches/5.17/0009-prjc_v5.17-r0.patch index d303b7c..661545b 100644 --- a/linux-tkg-patches/5.17/0009-prjc_v5.17-r0.patch +++ b/linux-tkg-patches/5.17/0009-prjc_v5.17-r0.patch @@ -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);