linux58-tkg: Add prjc/BMQ fix 476c03d6ff

master
Tk-Glitch 2020-08-12 18:24:29 +07:00
parent 82974f4a15
commit 0c8886a2b2
2 changed files with 30 additions and 1 deletions

@ -150,7 +150,7 @@ sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204' 'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7' '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
'fc419a83cc69118d1fd517f86ce47593db8837d6546a2553002a46ee3453237b' 'aa02d8dc476093eec104020bca4e47b0684381f3aa7d3caeb50c6b195c19a02f'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
'98311deeb474b39e821cd1e64198793d5c4d797155b3b8bbcb1938b7f11e8d74') '98311deeb474b39e821cd1e64198793d5c4d797155b3b8bbcb1938b7f11e8d74')

@ -7985,3 +7985,32 @@ index b5e3496cf803..cfbae0a21cef 100644
}; };
struct wakeup_test_data *x = data; struct wakeup_test_data *x = data;
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
index 0a75a830de0586e306868b07a650092897f42af1..5db1f74f35592f9fe087fe3689daf127fa5b3ffc 100644
--- a/kernel/sched/alt_core.c
+++ b/kernel/sched/alt_core.c
@@ -141,7 +141,9 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
#define IDLE_WM (IDLE_TASK_SCHED_PRIO)
+#ifdef CONFIG_SCHED_SMT
static cpumask_t sched_sg_idle_mask ____cacheline_aligned_in_smp;
+#endif
static cpumask_t sched_rq_watermark[SCHED_BITS] ____cacheline_aligned_in_smp;
static inline void update_sched_rq_watermark(struct rq *rq)
@@ -5839,12 +5841,12 @@ void __init sched_init(void)
#ifdef CONFIG_SCHED_SMT
rq->active_balance = 0;
#endif
-#endif
- rq->nr_switches = 0;
#ifdef CONFIG_NO_HZ_COMMON
rq_csd_init(rq, &rq->nohz_csd, nohz_csd_func);
#endif
+#endif /* CONFIG_SMP */
+ rq->nr_switches = 0;
hrtick_rq_init(rq);
atomic_set(&rq->nr_iowait, 0);