linux58-tkg: Add prjc/BMQ fix 476c03d6ff

This commit is contained in:
Tk-Glitch
2020-08-12 18:24:29 +02:00
parent 82974f4a15
commit 0c8886a2b2
2 changed files with 30 additions and 1 deletions

View File

@@ -7985,3 +7985,32 @@ index b5e3496cf803..cfbae0a21cef 100644
};
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);