CCF_100/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux510-tkg: Update Project C patchset to v5.10-r2 - http://cchalpha.blogspot.com/2020/12/project-c-v510-r2-release.html

Browse Source
This commit is contained in:
Tk-Glitch
2021-01-01 15:22:32 +01:00
parent 3b4bf5cbeb
commit 2c67f8782d
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKGBUILD
View File

@@ -312,7 +312,7 @@ case $_basever in
#0008-5.10-bcachefs.patch #0008-5.10-bcachefs.patch
0009-glitched-ondemand-bmq.patch 0009-glitched-ondemand-bmq.patch
0009-glitched-bmq.patch 0009-glitched-bmq.patch
0009-prjc_v5.10-r1.patch 0009-prjc_v5.10-r2.patch
0011-ZFS-fix.patch 0011-ZFS-fix.patch
#0012-linux-hardened.patch #0012-linux-hardened.patch
0012-misc-additions.patch 0012-misc-additions.patch
@@ -338,7 +338,7 @@ case $_basever in
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'3db1c9aaae36336fdca8fe80fe87ed95732e63f1f445735f1f7f1c0d77240476' 'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
'433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e') '433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')
;; ;;

2
linux-tkg-config/prepare
View File

@@ -369,7 +369,7 @@ _tkg_srcprep() {
elif [ "$_basever" = "59" ]; then elif [ "$_basever" = "59" ]; then
rev=3 rev=3
elif [ "$_basever" = "510" ]; then elif [ "$_basever" = "510" ]; then
rev=1 rev=2
else else
rev=0 rev=0
fi fi

20
linux-tkg-patches/5.10/0009-prjc_v5.10-r1.patch → linux-tkg-patches/5.10/0009-prjc_v5.10-r2.patch
View File

@@ -830,7 +830,7 @@ index 5fc9c9b70862..eb6d7d87779f 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..9880d9b50f7e index 000000000000..be766515662c
--- /dev/null --- /dev/null
+++ b/kernel/sched/alt_core.c +++ b/kernel/sched/alt_core.c
@@ -0,0 +1,6385 @@ @@ -0,0 +1,6385 @@
@@ -888,7 +888,7 @@ index 000000000000..9880d9b50f7e
+ */ + */
+EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_irq_tp); +EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_irq_tp);
+ +
+#define ALT_SCHED_VERSION "v5.10-r1" +#define ALT_SCHED_VERSION "v5.10-r2"
+ +
+/* 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)
@@ -7258,7 +7258,7 @@ index 000000000000..1212a031700e
+{} +{}
diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
new file mode 100644 new file mode 100644
index 000000000000..5d6ee22875b9 index 000000000000..d979b4b1aac2
--- /dev/null --- /dev/null
+++ b/kernel/sched/alt_sched.h +++ b/kernel/sched/alt_sched.h
@@ -0,0 +1,612 @@ @@ -0,0 +1,612 @@
@@ -7507,7 +7507,7 @@ index 000000000000..5d6ee22875b9
+#endif +#endif
+} +}
+ +
+static inline int best_mask_cpu(int cpu, cpumask_t *mask) +static inline int best_mask_cpu(int cpu, const cpumask_t *mask)
+{ +{
+#if NR_CPUS <= 64 +#if NR_CPUS <= 64
+ unsigned long llc_match; + unsigned long llc_match;
@@ -7896,10 +7896,10 @@ index 000000000000..aba3c98759f8
+#endif +#endif
diff --git a/kernel/sched/bmq_imp.h b/kernel/sched/bmq_imp.h diff --git a/kernel/sched/bmq_imp.h b/kernel/sched/bmq_imp.h
new file mode 100644 new file mode 100644
index 000000000000..3faba5f9bb69 index 000000000000..13eda4b26b6a
--- /dev/null --- /dev/null
+++ b/kernel/sched/bmq_imp.h +++ b/kernel/sched/bmq_imp.h
@@ -0,0 +1,198 @@ @@ -0,0 +1,200 @@
+#define ALT_SCHED_VERSION_MSG "sched/bmq: BMQ CPU Scheduler "ALT_SCHED_VERSION" by Alfred Chen.\n" +#define ALT_SCHED_VERSION_MSG "sched/bmq: BMQ CPU Scheduler "ALT_SCHED_VERSION" by Alfred Chen.\n"
+ +
+/* +/*
@@ -8087,11 +8087,13 @@ index 000000000000..3faba5f9bb69
+ p->boost_prio = MAX_PRIORITY_ADJ; + p->boost_prio = MAX_PRIORITY_ADJ;
+} +}
+ +
+#ifdef CONFIG_SMP
+static void sched_task_ttwu(struct task_struct *p) +static void sched_task_ttwu(struct task_struct *p)
+{ +{
+ if(this_rq()->clock_task - p->last_ran > sched_timeslice_ns) + if(this_rq()->clock_task - p->last_ran > sched_timeslice_ns)
+ boost_task(p); + boost_task(p);
+} +}
+#endif
+ +
+static void sched_task_deactivate(struct task_struct *p, struct rq *rq) +static void sched_task_deactivate(struct task_struct *p, struct rq *rq)
+{ +{
@@ -8244,10 +8246,10 @@ index 000000000000..623908cf4380
+#endif +#endif
diff --git a/kernel/sched/pds_imp.h b/kernel/sched/pds_imp.h diff --git a/kernel/sched/pds_imp.h b/kernel/sched/pds_imp.h
new file mode 100644 new file mode 100644
index 000000000000..6b2140f0a69e index 000000000000..b1ad3d0b0430
--- /dev/null --- /dev/null
+++ b/kernel/sched/pds_imp.h +++ b/kernel/sched/pds_imp.h
@@ -0,0 +1,272 @@ @@ -0,0 +1,274 @@
+#define ALT_SCHED_VERSION_MSG "sched/pds: PDS CPU Scheduler "ALT_SCHED_VERSION" by Alfred Chen.\n" +#define ALT_SCHED_VERSION_MSG "sched/pds: PDS CPU Scheduler "ALT_SCHED_VERSION" by Alfred Chen.\n"
+ +
+static const u64 user_prio2deadline[NICE_WIDTH] = { +static const u64 user_prio2deadline[NICE_WIDTH] = {
@@ -8518,7 +8520,9 @@ index 000000000000..6b2140f0a69e
+ time_slice_expired(p, rq); + time_slice_expired(p, rq);
+} +}
+ +
+#ifdef CONFIG_SMP
+static void sched_task_ttwu(struct task_struct *p) {} +static void sched_task_ttwu(struct task_struct *p) {}
+#endif
+static void sched_task_deactivate(struct task_struct *p, struct rq *rq) {} +static void sched_task_deactivate(struct task_struct *p, struct rq *rq) {}
diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c
index 2c613e1cff3a..0103b2a7201d 100644 index 2c613e1cff3a..0103b2a7201d 100644