From dd166852ece462771a864db564a4813598279d06 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 17 Jan 2022 19:06:33 +0100 Subject: [PATCH] linux516-tkg: Fix llvm compilation and prjc patchset, default to 5.16 --- PKGBUILD | 6 +++--- linux-tkg-config/5.16/config.x86_64 | 1 + linux-tkg-config/prepare | 2 +- linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 534363a..a144ff0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -59,7 +59,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=235 +pkgrel=237 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -695,7 +695,7 @@ case $_basever in sha256sums=('027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb' '9ff97f3a01ec8744863ff611315c44c1f5d1ff551769f7d8359c85561dee1b1d' 'SKIP' - '7cbba374356a189faac71001c5344ce8f02434684b1ce1accefc0cc4bd6718e5' + 'c1445d77355dc742f7690748d33c289ad7fd380c7aa66230ebf85d298c072729' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' 'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6' @@ -710,7 +710,7 @@ case $_basever in 'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' - '112ffa17df6b960ca557dee48167dfc864d265865b16d9984088809570504e9d' + 'e1b150ff3e7dfd63a7f98c4acbd036e94cc736026cda9d679e9d79dbab265d27' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' diff --git a/linux-tkg-config/5.16/config.x86_64 b/linux-tkg-config/5.16/config.x86_64 index 40c8019..2853bee 100644 --- a/linux-tkg-config/5.16/config.x86_64 +++ b/linux-tkg-config/5.16/config.x86_64 @@ -10633,6 +10633,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 8accbb7..6fe4020 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -117,7 +117,7 @@ _set_kernel_version() { done #Default index corresponds to latest stable kernel - _default_index="1" + _default_index="0" _prompt_from_array "${_kernel_fullver_list[@]}" _version=${_supported_kernels[$_selected_index]} fi diff --git a/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch b/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch index 79d3092..2ed57a2 100644 --- a/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch +++ b/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch @@ -9564,6 +9564,22 @@ diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c index 07dde2928c79..6a6edc730dce 100644 --- a/kernel/sched/stats.c +++ b/kernel/sched/stats.c +@@ -4,6 +4,7 @@ + */ + #include "sched.h" + ++#ifndef CONFIG_SCHED_ALT + void __update_stats_wait_start(struct rq *rq, struct task_struct *p, + struct sched_statistics *stats) + { +@@ -90,6 +90,7 @@ + } + } + ++#endif + /* + * Current schedstat API version. + * @@ -126,8 +126,10 @@ static int show_schedstat(struct seq_file *seq, void *v) } else { struct rq *rq;