From a6bbe3148a746642a57002b078bb46cbfc75607f Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Sat, 9 Apr 2022 03:51:36 +0200 Subject: [PATCH] linux515/516/517: Add fix for Project C breakage with last updates - https://gitlab.com/alfredchen/linux-prjc/-/issues/56 Also sync defconfigs --- PKGBUILD | 14 +++++------ linux-tkg-config/5.15/config.x86_64 | 1 + linux-tkg-config/5.16/config.x86_64 | 1 + linux-tkg-config/5.17/config.x86_64 | 5 ++-- .../5.15/0009-prjc_v5.15-r1.patch | 25 +++++++++++++++++++ .../5.16/0009-prjc_v5.16-r1.patch | 25 +++++++++++++++++++ .../5.17/0009-prjc_v5.17-r0.patch | 25 +++++++++++++++++++ 7 files changed, 87 insertions(+), 9 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 14fe0a7..a9a7a6f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -59,7 +59,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=252 +pkgrel=253 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -611,7 +611,7 @@ case $_basever in ) sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8' '958da4f2432230ac20812e35d8cf68d8f7cbe5ffb212c1e459288ec7de982814' - '24be2e8863e265195a24d7082804cd4328fd9f0a31b88672c884b9fd42469ed8' + '5019607e781386636feefd075a50a496a08c9743e52ddcb87f73d0a283c6fcbc' '6e3ef6bc4779ae3b7154642147d5ab3ece6e38e3e08bdb30f86d89d2b4855fa9' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' @@ -629,7 +629,7 @@ case $_basever in '68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc' - '7859fe0537662304a62b8f9bf9f6aff201d27097753f9c61e368a7fd19cc55df' + '4286b99beb5683b4eb7dd7cc2edb351ce9e8ca20f7eb81dec374c70d0deb6287' '4499b55ed1c0b9527feba77160f6f244c93dfed417d04e0ba88a077a8140b281' '434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' @@ -666,7 +666,7 @@ case $_basever in ) sha256sums=('027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb' '1881902beb02ed33fbf3a21ebef1d61578e0dacb7f39ad4066a10038b8df7889' - '5b54e733edceca75df8d7c44aee4a811f3d058861ce54ab0839a7705d47e59df' + '7197c3204acf05e982e5550830b0a3220e7b3aaa6a73ca3b19b5966e23ffa65a' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' 'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6' @@ -681,7 +681,7 @@ case $_basever in 'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' - 'ccf8d7dc78e92577f826f3e4d76453b1a873d41eb0df15528d117b25925b3f77' + '74347a44ca8dba425fb5ba8aa02b6c269a551488320f93a2c357a7f15c2f3e5a' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' @@ -718,7 +718,7 @@ case $_basever in ) sha256sums=('555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1' '7d21d9b8818421d52b94f5b74138677155e8f543fd29c39c22beefdb128d5967' - 'c05ff4ca7a69b94ace73d1019c398f3fd93dfa0ebcc9b2396b56aaa191fc72e0' + 'c0ef360e34fd21c23509224abae894b0d6d37256cccf82575062a05986ee5dba' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' 'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6' @@ -733,7 +733,7 @@ case $_basever in 'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' - '95fd78b725360742ead8c55eea7e3ff7ac8ae11ae1a21a0d881e168a841bc9b4' + 'ba65acd3f1168a7479e3665b5b13f7d1066e713eadb5a0e5110423ba97d7ccd3' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' diff --git a/linux-tkg-config/5.15/config.x86_64 b/linux-tkg-config/5.15/config.x86_64 index 7a622fe..914e9e3 100644 --- a/linux-tkg-config/5.15/config.x86_64 +++ b/linux-tkg-config/5.15/config.x86_64 @@ -3044,6 +3044,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m diff --git a/linux-tkg-config/5.16/config.x86_64 b/linux-tkg-config/5.16/config.x86_64 index c995ff9..95ac1d3 100644 --- a/linux-tkg-config/5.16/config.x86_64 +++ b/linux-tkg-config/5.16/config.x86_64 @@ -3059,6 +3059,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m diff --git a/linux-tkg-config/5.17/config.x86_64 b/linux-tkg-config/5.17/config.x86_64 index 97c4fd4..eb6c2e5 100644 --- a/linux-tkg-config/5.17/config.x86_64 +++ b/linux-tkg-config/5.17/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.0-arch1 Kernel Configuration +# Linux/x86 5.17.2-arch1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -3073,6 +3073,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m @@ -6582,7 +6583,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y # end of Console display driver support diff --git a/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch b/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch index 162eb42..56106a3 100644 --- a/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch +++ b/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch @@ -9793,3 +9793,28 @@ index adf7ef194005..11c8f36e281b 100644 }; struct wakeup_test_data *x = data; +diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h +index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644 +--- a/kernel/sched/alt_sched.h ++++ b/kernel/sched/alt_sched.h +@@ -654,6 +654,20 @@ static inline int sched_numa_find_closest(const struct cpumask *cpus, int cpu) + } + #endif + ++static inline ++unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long boost, ++ struct task_struct *p) ++{ ++ return boost; ++} ++ ++static inline bool uclamp_rq_is_capped(struct rq *rq) { return false; } ++ ++static inline bool uclamp_is_used(void) ++{ ++ return false; ++} ++ + 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); + diff --git a/linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch b/linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch index a913e3f..a1effad 100644 --- a/linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch +++ b/linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch @@ -9850,3 +9850,28 @@ index abcadbe933bb..d4c778b0ab0e 100644 }; struct wakeup_test_data *x = data; +diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h +index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644 +--- a/kernel/sched/alt_sched.h ++++ b/kernel/sched/alt_sched.h +@@ -654,6 +654,20 @@ static inline int sched_numa_find_closest(const struct cpumask *cpus, int cpu) + } + #endif + ++static inline ++unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long boost, ++ struct task_struct *p) ++{ ++ return boost; ++} ++ ++static inline bool uclamp_rq_is_capped(struct rq *rq) { return false; } ++ ++static inline bool uclamp_is_used(void) ++{ ++ return false; ++} ++ + 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); + 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 661545b..bfc9829 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 @@ -9942,3 +9942,28 @@ index e5a7a638f3fbe0f40f9b0be709ccbd02039d6d3b..163cec668095133a3f1d34df462cc7b8 int sched_numa_find_closest(const struct cpumask *cpus, int cpu) { return best_mask_cpu(cpu, cpus); +diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h +index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644 +--- a/kernel/sched/alt_sched.h ++++ b/kernel/sched/alt_sched.h +@@ -654,6 +654,20 @@ static inline int sched_numa_find_closest(const struct cpumask *cpus, int cpu) + } + #endif + ++static inline ++unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long boost, ++ struct task_struct *p) ++{ ++ return boost; ++} ++ ++static inline bool uclamp_rq_is_capped(struct rq *rq) { return false; } ++ ++static inline bool uclamp_is_used(void) ++{ ++ return false; ++} ++ + 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); +