5.15.3.arch1

4 files changed, 37 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb20a4723fec..bcac99fd7e35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-pds
 	pkgdesc = Linux
-	pkgver = 5.15.2.arch1
+	pkgver = 5.15.3.arch1
 	pkgrel = 1
-	url = https://github.com/archlinux/linux/commits/v5.15.2-arch1
+	url = https://github.com/archlinux/linux/commits/v5.15.3-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -20,10 +20,10 @@ pkgbase = linux-pds
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = linux-archlinux::git+https://github.com/archlinux/linux.git?signed#tag=v5.15.2-arch1
+	source = linux-archlinux::git+https://github.com/archlinux/linux.git?signed#tag=v5.15.3-arch1
 	source = git+https://github.com/graysky2/kernel_compiler_patch.git
 	source = config
-	source = 0009-prjc_v5.15-r0.patch
+	source = 0009-prjc_v5.15-r1.patch
 	source = 0005-glitched-pds.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -31,8 +31,8 @@ pkgbase = linux-pds
 	validpgpkeys = C7E7849466FE2358343588377258734B41C31549
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = dd277719735f06c09ac4f54b1dafef12a03478012662d0711766a49987576784ed7dd574d8947012d927a16b688dc08711658c7a196c195754442e4356752e11
-	sha512sums = 5da7ac4a3e9ea8e9e1d37403d688369e5ffdc2340bd60eabf36368a4e134713ae1011f728ea79f44ff5d2ab2827adf69e5d05db3431b73e8027238f5ea68a49f
+	sha512sums = 1679a692ef2be920357c6766568859e10db91fc59e566e9db2568b9b02c955e33b703330fc5104f2d263e8beb40ce0a726f25a0a2ed62df00ba2daebe8de5583
+	sha512sums = 1abcd3f10941b6e342cabb5fcd3d2a097ceb2451acad09336d3b191ace0bccca23202d87cc916fc0bacaf977e96b26a85e2b6729a08117c4cbe40a470dbf6eaa
 	sha512sums = 889f0a49f326de3f119290256393b09a9e9241c2a297ca0b7967a2884e4e35d71388d2a559e4c206f55f67228b65e8f2013a1ec61f6ff8f1de3b6a725fd5fa57
 
 pkgname = linux-pds
diff --git a/0009-prjc_v5.15-r0.patch b/0009-prjc_v5.15-r1.patch
index 1d0c322471e2..5886349e0ca0 100644
--- a/0009-prjc_v5.15-r0.patch
+++ b/0009-prjc_v5.15-r1.patch
@@ -1,5 +1,5 @@
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 43dc35fe5bc0..0873e92ca5d0 100644
+index 1396fd2d9031..6ccb561c9a54 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -4985,6 +4985,12 @@
@@ -150,10 +150,10 @@ index 000000000000..05c84eec0f31
 +priority boost from unblocking while background threads that do most of the
 +processing receive the priority penalty for using their entire timeslice.
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 533d5836eb9a..5756c51c9b58 100644
+index 1f394095eb88..2c3d95546908 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -477,7 +477,7 @@ static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns,
+@@ -480,7 +480,7 @@ static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns,
  		seq_puts(m, "0 0 0\n");
  	else
  		seq_printf(m, "%llu %llu %lu\n",
@@ -663,10 +663,10 @@ index 978fcfca5871..0425ee149b4d 100644
  obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
 diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
 new file mode 100644
-index 000000000000..9576c57f82da
+index 000000000000..8b0ddbdd24e4
 --- /dev/null
 +++ b/kernel/sched/alt_core.c
-@@ -0,0 +1,7626 @@
+@@ -0,0 +1,7627 @@
 +/*
 + *  kernel/sched/alt_core.c
 + *
@@ -736,7 +736,7 @@ index 000000000000..9576c57f82da
 +#define sched_feat(x)	(0)
 +#endif /* CONFIG_SCHED_DEBUG */
 +
-+#define ALT_SCHED_VERSION "v5.15-r0"
++#define ALT_SCHED_VERSION "v5.15-r1"
 +
 +/* rt_prio(prio) defined in include/linux/sched/rt.h */
 +#define rt_task(p)		rt_prio((p)->prio)
@@ -3581,9 +3581,6 @@ index 000000000000..9576c57f82da
 + */
 +int sched_fork(unsigned long clone_flags, struct task_struct *p)
 +{
-+	unsigned long flags;
-+	struct rq *rq;
-+
 +	__sched_fork(clone_flags, p);
 +	/*
 +	 * We mark the process as NEW here. This guarantees that
@@ -3617,6 +3614,20 @@ index 000000000000..9576c57f82da
 +		p->sched_reset_on_fork = 0;
 +	}
 +
++#ifdef CONFIG_SCHED_INFO
++	if (unlikely(sched_info_on()))
++		memset(&p->sched_info, 0, sizeof(p->sched_info));
++#endif
++	init_task_preempt_count(p);
++
++	return 0;
++}
++
++void sched_post_fork(struct task_struct *p, struct kernel_clone_args *kargs)
++{
++	unsigned long flags;
++	struct rq *rq;
++
 +	/*
 +	 * The child is not yet in the pid-hash so no cgroup attach races,
 +	 * and the cgroup is pinned to this child due to cgroup_fork()
@@ -3651,20 +3662,10 @@ index 000000000000..9576c57f82da
 +	 * We're setting the CPU for the first time, we don't migrate,
 +	 * so use __set_task_cpu().
 +	 */
-+	__set_task_cpu(p, cpu_of(rq));
++	__set_task_cpu(p, smp_processor_id());
 +	raw_spin_unlock_irqrestore(&p->pi_lock, flags);
-+
-+#ifdef CONFIG_SCHED_INFO
-+	if (unlikely(sched_info_on()))
-+		memset(&p->sched_info, 0, sizeof(p->sched_info));
-+#endif
-+	init_task_preempt_count(p);
-+
-+	return 0;
 +}
 +
-+void sched_post_fork(struct task_struct *p) {}
-+
 +#ifdef CONFIG_SCHEDSTATS
 +
 +DEFINE_STATIC_KEY_FALSE(sched_schedstats);
@@ -9706,7 +9707,7 @@ index 0ea8702eb516..a27a0f3a654d 100644
  
  	hrtimer_init_sleeper_on_stack(&t, clockid, mode);
 diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
-index 643d412ac623..6bf27565242f 100644
+index 96b4e7810426..83457e8bb5d2 100644
 --- a/kernel/time/posix-cpu-timers.c
 +++ b/kernel/time/posix-cpu-timers.c
 @@ -216,7 +216,7 @@ static void task_sample_cputime(struct task_struct *p, u64 *samples)
diff --git a/PKGBUILD b/PKGBUILD
index 903ba148f907..e295c5d39c43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -60,7 +60,7 @@ _subarch=
 _localmodcfg=
 
 pkgbase=linux-pds
-pkgver=5.15.2.arch1
+pkgver=5.15.3.arch1
 pkgrel=1
 pkgdesc="Linux"
 _srcver_tag=v${pkgver%.*}-${pkgver##*.}
@@ -95,7 +95,7 @@ _kernel_patch_name="more-uarches-for-kernel-5.15+.patch"
 _pkgdesc_extra="~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG"
 
 PatchesArray=(
-    0009-prjc_v5.15-r0.patch
+    0009-prjc_v5.15-r1.patch
     0005-glitched-pds.patch
 )
 
@@ -113,8 +113,8 @@ validpgpkeys=(
 )
 sha512sums=('SKIP'
             'SKIP'
-            'dd277719735f06c09ac4f54b1dafef12a03478012662d0711766a49987576784ed7dd574d8947012d927a16b688dc08711658c7a196c195754442e4356752e11'
-            '5da7ac4a3e9ea8e9e1d37403d688369e5ffdc2340bd60eabf36368a4e134713ae1011f728ea79f44ff5d2ab2827adf69e5d05db3431b73e8027238f5ea68a49f'
+            '1679a692ef2be920357c6766568859e10db91fc59e566e9db2568b9b02c955e33b703330fc5104f2d263e8beb40ce0a726f25a0a2ed62df00ba2daebe8de5583'
+            '1abcd3f10941b6e342cabb5fcd3d2a097ceb2451acad09336d3b191ace0bccca23202d87cc916fc0bacaf977e96b26a85e2b6729a08117c4cbe40a470dbf6eaa'
             '889f0a49f326de3f119290256393b09a9e9241c2a297ca0b7967a2884e4e35d71388d2a559e4c206f55f67228b65e8f2013a1ec61f6ff8f1de3b6a725fd5fa57')
 
 export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index 753b4df616d1..8968306aae8d 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.2-arch1 Kernel Configuration
+# Linux/x86 5.15.3-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -824,6 +824,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
 CONFIG_HAVE_STATIC_CALL=y
 CONFIG_HAVE_STATIC_CALL_INLINE=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
@@ -9914,7 +9915,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
@@ -10067,11 +10068,11 @@ CONFIG_CRYPTO_ZSTD=y
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m