From 56521c94ad2e9a5e76152ce70b7ec724472fee54 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Fri, 19 Nov 2021 14:30:02 +0100
Subject: [PATCH] linux515-tkg: Update prjc patchset to v5.15.r1 -
 https://gitlab.com/alfredchen/projectc/-/blob/master/5.15/prjc_v5.15-r1.patch

---
 PKGBUILD                                      |  6 +-
 linux-tkg-config/prepare                      |  2 +
 ...5.15-r0.patch => 0009-prjc_v5.15-r1.patch} | 55 ++++++++-----------
 3 files changed, 27 insertions(+), 36 deletions(-)
 rename linux-tkg-patches/5.15/{0009-prjc_v5.15-r0.patch => 0009-prjc_v5.15-r1.patch} (99%)

diff --git a/PKGBUILD b/PKGBUILD
index c4b0845..2b218e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,7 +59,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=219
+pkgrel=220
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -627,7 +627,7 @@ case $_basever in
         #0008-5.14-bcachefs.patch
         0009-glitched-ondemand-bmq.patch
         0009-glitched-bmq.patch
-        0009-prjc_v5.15-r0.patch
+        0009-prjc_v5.15-r1.patch
         #0012-linux-hardened.patch
         0012-misc-additions.patch
         # MM Dirty Soft for WRITE_WATCH support in Wine
@@ -653,7 +653,7 @@ case $_basever in
             'a71ea523f0a7bcd24e2ad144ff12160aa03dc3f0c64daceac8dc1aae523d4491'
             '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
             'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
-            'bf41accfc570b2926d1c5b7a63a4b585860a355eec7081f08a0406d16b52b0b8'
+            '768239d739180c0199545b5c5cf2d78de6261aec769008e6a2b7e97c7477b756'
             '434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d'
             '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
             'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index a30a384..a9cd30b 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -445,6 +445,8 @@ _tkg_srcprep() {
     rev=3
   elif [ "$_basever" = "514" ]; then
     rev=3
+  elif [ "$_basever" = "515" ]; then
+    rev=1
   else
     rev=0
   fi
diff --git a/linux-tkg-patches/5.15/0009-prjc_v5.15-r0.patch b/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch
similarity index 99%
rename from linux-tkg-patches/5.15/0009-prjc_v5.15-r0.patch
rename to linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch
index e0738fe..5886349 100644
--- a/linux-tkg-patches/5.15/0009-prjc_v5.15-r0.patch
+++ b/linux-tkg-patches/5.15/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)
@@ -9785,15 +9786,3 @@ index adf7ef194005..11c8f36e281b 100644
  	};
  	struct wakeup_test_data *x = data;
  
-diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
-index f56abe47c5d6..51800459ce91 100644
---- a/kernel/sched/alt_core.c
-+++ b/kernel/sched/alt_core.c
-@@ -2996,7 +2996,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
- 	return 0;
- }
-
--void sched_post_fork(struct task_struct *p) {}
-+void sched_post_fork(struct task_struct *p, struct kernel_clone_args *kargs) {}
-
- #ifdef CONFIG_SCHEDSTATS