sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux515-tkg: Fix Project C for v5.15.58 (#562)

Browse Source
This commit is contained in:
Dmitry Skvortsov
2022-08-02 12:35:08 +03:00
committed by GitHub
parent f1dfabb6a9
commit 413b1383f5
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch
View File

@@ -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)