omlp_fz_police bug fixupdate_litmus_2019

3 files changed, 3 insertions, 3 deletions

diff --git a/kernel/sched/litmus.c b/kernel/sched/litmus.c
index a28aa5ab28f7..2e3ca79d39a9 100644
--- a/kernel/sched/litmus.c
+++ b/kernel/sched/litmus.c
@@ -362,7 +362,7 @@ const struct sched_class litmus_sched_class = {
          * cpu-hotplug or cpu throttling. Allows Litmus to use up to 1.0
          * CPU capacity.
          */
-        .next                   = &stop_sched_class,
+        .next                   = &fair_sched_class,
         .enqueue_task           = enqueue_task_litmus,
         .dequeue_task           = dequeue_task_litmus,
         .yield_task             = yield_task_litmus,
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index babfdd90c6a5..12d40dfd715f 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2363,7 +2363,7 @@ static unsigned int get_rr_interval_rt(struct rq *rq, struct task_struct *task)
 }
 
 const struct sched_class rt_sched_class = {
-        .next                   = &fair_sched_class,
+        .next                   = &litmus_sched_class,
         .enqueue_task           = enqueue_task_rt,
         .dequeue_task           = dequeue_task_rt,
         .yield_task             = yield_task_rt,
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index c4f7afbe90c0..ebbd4c05289b 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1798,7 +1798,7 @@ static inline void set_next_task(struct rq *rq, struct task_struct *next)
  * class, but existing plugins (that predate the stop-machine class) depend on
  * the assumption that LITMUS^RT plugins are the top scheduling class.
  */
-#define sched_class_highest (&litmus_sched_class)
+#define sched_class_highest (&stop_sched_class)
 
 /*
 #ifdef CONFIG_SMP