From 413b1383f5e8f62ddccaf0634a1ff561b8cea876 Mon Sep 17 00:00:00 2001
From: Dmitry Skvortsov <lvb.crd@protonmail.com>
Date: Tue, 2 Aug 2022 12:35:08 +0300
Subject: [PATCH] linux515-tkg: Fix Project C for v5.15.58 (#562)

---
 PKGBUILD                                      |  2 +-
 .../5.15/0009-prjc_v5.15-r1.patch             | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index b0c953c..6a21ad2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -629,7 +629,7 @@ case $_basever in
             '980be21d8b6a014752ea094fd996da3c8a25f5c38020e0d704b7f9d3181a5d9e'
             '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
             '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc'
-            '930996cdd9b63e3456cc49da4015631717c1c2ec41f879b25a9100e95e0b38fb'
+            '5e2e0f24dbf95502db9990d8ed6e50cfa3db92d534d8add264efc0ca223b698b'
             '4499b55ed1c0b9527feba77160f6f244c93dfed417d04e0ba88a077a8140b281'
             '434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d'
             '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
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 ec05141..3505125 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
@@ -9492,8 +9492,8 @@ index e06071bf3472..adf567df34d4 100644
  int update_thermal_load_avg(u64 now, struct rq *rq, u64 capacity);
  
  static inline u64 thermal_load_avg(struct rq *rq)
-@@ -42,6 +44,7 @@ static inline u32 get_pelt_divider(struct sched_avg *avg)
- 	return LOAD_AVG_MAX - 1024 + avg->period_contrib;
+@@ -44,6 +46,7 @@ static inline u32 get_pelt_divider(struct sched_avg *avg)
+ 	return PELT_MIN_DIVIDER + avg->period_contrib;
  }
  
 +#ifndef CONFIG_SCHED_ALT
@@ -9633,13 +9633,13 @@ index 4e8698e62f07..36c61551252e 100644
 +#endif /* CONFIG_NUMA */
 +#endif
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 083be6af29d7..09fc6281d488 100644
+index 23c08bf3db58..29ec36f63ae9 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -122,6 +122,10 @@ static unsigned long long_max = LONG_MAX;
- static int one_hundred = 100;
- static int two_hundred = 200;
- static int one_thousand = 1000;
+@@ -116,6 +116,10 @@ static int sixty = 60;
+ static unsigned long zero_ul;
+ static unsigned long one_ul = 1;
+ static unsigned long long_max = LONG_MAX;
 +#ifdef CONFIG_SCHED_ALT
 +static int __maybe_unused zero = 0;
 +extern int sched_yield_type;
@@ -9647,7 +9647,7 @@ index 083be6af29d7..09fc6281d488 100644
  #ifdef CONFIG_PRINTK
  static int ten_thousand = 10000;
  #endif
-@@ -1771,6 +1775,24 @@ int proc_do_static_key(struct ctl_table *table, int write,
+@@ -1775,6 +1779,24 @@ int proc_do_static_key(struct ctl_table *table, int write,
  }
  
  static struct ctl_table kern_table[] = {
@@ -9672,7 +9672,7 @@ index 083be6af29d7..09fc6281d488 100644
  	{
  		.procname	= "sched_child_runs_first",
  		.data		= &sysctl_sched_child_runs_first,
-@@ -1901,6 +1923,7 @@ static struct ctl_table kern_table[] = {
+@@ -1905,6 +1927,7 @@ static struct ctl_table kern_table[] = {
  		.extra2		= SYSCTL_ONE,
  	},
  #endif
@@ -9680,7 +9680,7 @@ index 083be6af29d7..09fc6281d488 100644
  #ifdef CONFIG_PROVE_LOCKING
  	{
  		.procname	= "prove_locking",
-@@ -2477,6 +2500,17 @@ static struct ctl_table kern_table[] = {
+@@ -2481,6 +2504,17 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= proc_dointvec,
  	},
  #endif
@@ -9691,8 +9691,8 @@ index 083be6af29d7..09fc6281d488 100644
 +		.maxlen		= sizeof (int),
 +		.mode		= 0644,
 +		.proc_handler	= &proc_dointvec_minmax,
-+		.extra1		= &zero,
-+		.extra2		= &two,
++		.extra1		= SYSCTL_ZERO,
++		.extra2		= SYSCTL_TWO,
 +	},
 +#endif
  #if defined(CONFIG_S390) && defined(CONFIG_SMP)