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

prjc-5.14: version bump (#331)

Browse Source 
Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>
This commit is contained in:
Adel Kara Slimane
2021-10-05 11:53:56 +02:00
committed by GitHub
parent 987eeca6b2
commit 67c26a6228
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKGBUILD
View File

@@ -564,7 +564,7 @@ case $_basever in
#0008-5.14-bcachefs.patch #0008-5.14-bcachefs.patch
0009-glitched-ondemand-bmq.patch 0009-glitched-ondemand-bmq.patch
0009-glitched-bmq.patch 0009-glitched-bmq.patch
0009-prjc_v5.14-r2.patch 0009-prjc_v5.14-r3.patch
#0012-linux-hardened.patch #0012-linux-hardened.patch
0012-misc-additions.patch 0012-misc-additions.patch
# MM Dirty Soft for WRITE_WATCH support in Wine # MM Dirty Soft for WRITE_WATCH support in Wine
@@ -589,7 +589,7 @@ case $_basever in
'034d12a73b507133da2c69a34d61efd2f6b6618549650aa26d748142d22002e1' '034d12a73b507133da2c69a34d61efd2f6b6618549650aa26d748142d22002e1'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'42ca7bceade1e6a998eeee394c77e3dd93db45ff0870a5dab22350bd0af45272' '2e2247183034fa4a2ea1cd943d3d24ee9ea52daf70d47e69d5564f8ac1367aa2'
'1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6') 'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')

2
linux-tkg-config/prepare
View File

@@ -441,7 +441,7 @@ _tkg_srcprep() {
elif [ "$_basever" = "513" ]; then elif [ "$_basever" = "513" ]; then
rev=3 rev=3
elif [ "$_basever" = "514" ]; then elif [ "$_basever" = "514" ]; then
rev=2 rev=3
else else
rev=0 rev=0
fi fi

22
linux-tkg-patches/5.14/0009-prjc_v5.14-r2.patch → linux-tkg-patches/5.14/0009-prjc_v5.14-r3.patch
View File

@@ -341,6 +341,20 @@ index e5af028c08b4..0a7565d0d3cf 100644
return false; return false;
} }
diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
index 8f0f778b7c91..991f2280475b 100644
--- a/include/linux/sched/topology.h
+++ b/include/linux/sched/topology.h
@@ -225,7 +225,8 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu)
#endif /* !CONFIG_SMP */
-#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)
+#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) && \
+ !defined(CONFIG_SCHED_ALT)
extern void rebuild_sched_domains_energy(void);
#else
static inline void rebuild_sched_domains_energy(void)
diff --git a/init/Kconfig b/init/Kconfig diff --git a/init/Kconfig b/init/Kconfig
index 55f9f7738ebb..9a9b244d3ca3 100644 index 55f9f7738ebb..9a9b244d3ca3 100644
--- a/init/Kconfig --- a/init/Kconfig
@@ -659,10 +673,10 @@ index 978fcfca5871..0425ee149b4d 100644
obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
new file mode 100644 new file mode 100644
index 000000000000..7c998e606114 index 000000000000..56aed2b1e42c
--- /dev/null --- /dev/null
+++ b/kernel/sched/alt_core.c +++ b/kernel/sched/alt_core.c
@@ -0,0 +1,7339 @@ @@ -0,0 +1,7341 @@
+/* +/*
+ * kernel/sched/alt_core.c + * kernel/sched/alt_core.c
+ * + *
@@ -732,7 +746,7 @@ index 000000000000..7c998e606114
+#define sched_feat(x) (0) +#define sched_feat(x) (0)
+#endif /* CONFIG_SCHED_DEBUG */ +#endif /* CONFIG_SCHED_DEBUG */
+ +
+#define ALT_SCHED_VERSION "v5.14-r2" +#define ALT_SCHED_VERSION "v5.14-r3"
+ +
+/* rt_prio(prio) defined in include/linux/sched/rt.h */ +/* rt_prio(prio) defined in include/linux/sched/rt.h */
+#define rt_task(p) rt_prio((p)->prio) +#define rt_task(p) rt_prio((p)->prio)
@@ -4133,6 +4147,7 @@ index 000000000000..7c998e606114
+ s64 ns = rq->clock_task - p->last_ran; + s64 ns = rq->clock_task - p->last_ran;
+ +
+ p->sched_time += ns; + p->sched_time += ns;
+ cgroup_account_cputime(p, ns);
+ account_group_exec_runtime(p, ns); + account_group_exec_runtime(p, ns);
+ +
+ p->time_slice -= ns; + p->time_slice -= ns;
@@ -4695,6 +4710,7 @@ index 000000000000..7c998e606114
+ if (cpumask_test_cpu(dest_cpu, p->cpus_ptr)) { + if (cpumask_test_cpu(dest_cpu, p->cpus_ptr)) {
+ __SCHED_DEQUEUE_TASK(p, rq, 0, ); + __SCHED_DEQUEUE_TASK(p, rq, 0, );
+ set_task_cpu(p, dest_cpu); + set_task_cpu(p, dest_cpu);
+ sched_task_sanity_check(p, dest_rq);
+ __SCHED_ENQUEUE_TASK(p, dest_rq, 0); + __SCHED_ENQUEUE_TASK(p, dest_rq, 0);
+ nr_migrated++; + nr_migrated++;
+ } + }