linux59-tkg: Update prjc patchset - 12a53f3186

This commit is contained in:
Tk-Glitch 2020-10-12 15:21:04 +02:00
parent e67e690069
commit 07c93cdc11
2 changed files with 53 additions and 23 deletions

View File

@ -45,7 +45,7 @@ else
fi
pkgname=("${pkgbase}" "${pkgbase}-headers")
pkgver="${_basekernel}"."${_sub}"
pkgrel=1
pkgrel=2
pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here
url="http://www.kernel.org/"
@ -96,7 +96,7 @@ sha256sums=('3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'83ddfd5db3068f47b64d331d411e7c76a8f7366e51112f73d3aa0198a4c2116b'
'88c7e308e474c845e0cc09e09bd223fc39876eca757abf6d6c3b8321f49ce1f1'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
'433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')

View File

@ -8422,15 +8422,6 @@ diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c
index 2c613e1cff3a..0103b2a7201d 100644
--- a/kernel/sched/pelt.c
+++ b/kernel/sched/pelt.c
@@ -83,6 +83,8 @@ static u32 __accumulate_pelt_segments(u64 periods, u32 d1, u32 d3)
return c1 + c2 + c3;
}
+#define cap_scale(v, s) ((v)*(s) >> SCHED_CAPACITY_SHIFT)
+
/*
* Accumulate the three separate parts of the sum; d1 the remainder
* of the last (incomplete) period, d2 the span of full periods and d3
@@ -270,6 +270,7 @@ ___update_load_avg(struct sched_avg *sa, unsigned long load)
WRITE_ONCE(sa->util_avg, sa->util_sum / divider);
}
@ -8450,18 +8441,6 @@ index 2c613e1cff3a..0103b2a7201d 100644
/*
* thermal:
*
@@ -388,10 +393,8 @@ int update_irq_load_avg(struct rq *rq, u64 running)
1,
1);
- if (ret) {
+ if (ret)
___update_load_avg(&rq->avg_irq, 1);
- trace_pelt_irq_tp(rq);
- }
return ret;
}
diff --git a/kernel/sched/pelt.h b/kernel/sched/pelt.h
index 795e43e02afc..856163dac896 100644
--- a/kernel/sched/pelt.h
@ -8777,3 +8756,54 @@ index b5e3496cf803..65f60c77bc50 100644
};
struct wakeup_test_data *x = data;
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
index f36264fea75c6ca7c34eaa259c0bff829cbf6ac0..d43ca62fd00fe442bda9b4ad548fae432a7436de 100644
--- a/kernel/sched/alt_core.c
+++ b/kernel/sched/alt_core.c
@@ -11,6 +11,10 @@
* scheduler by Alfred Chen.
* 2019-02-20 BMQ(BitMap Queue) kernel scheduler by Alfred Chen.
*/
+#define CREATE_TRACE_POINTS
+#include <trace/events/sched.h>
+#undef CREATE_TRACE_POINTS
+
#include "sched.h"
#include <linux/sched/rt.h>
@@ -42,8 +46,11 @@
#include "pelt.h"
#include "smp.h"
-#define CREATE_TRACE_POINTS
-#include <trace/events/sched.h>
+/*
+ * Export tracepoints that act as a bare tracehook (ie: have no trace event
+ * associated with them) to allow external modules to probe them.
+ */
+EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_irq_tp);
#define ALT_SCHED_VERSION "v5.9-r0"
diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
index 99be2c51c88d0406cced20b36d7230da12930a5c..03f8b8b1aa27eeb15989af25b4050c767da12aad 100644
--- a/kernel/sched/alt_sched.h
+++ b/kernel/sched/alt_sched.h
@@ -46,6 +46,8 @@
#include "cpupri.h"
+#include <trace/events/sched.h>
+
#ifdef CONFIG_SCHED_BMQ
#include "bmq.h"
#endif
@@ -496,6 +498,8 @@ static inline int sched_tick_offload_init(void) { return 0; }
extern void schedule_idle(void);
+#define cap_scale(v, s) ((v)*(s) >> SCHED_CAPACITY_SHIFT)
+
/*
* !! For sched_setattr_nocheck() (kernel) only !!
*