More rebase cleanup

3 files changed, 5 insertions, 7 deletions

diff --git a/kernel/sched/litmus.c b/kernel/sched/litmus.c
index 5244f9e1da6f..86a646b1f724 100644
--- a/kernel/sched/litmus.c
+++ b/kernel/sched/litmus.c
@@ -268,6 +268,7 @@ static struct task_struct *pick_next_task_litmus(struct rq *rq,
         struct task_struct *prev, struct rq_flags *rf)
 {
         struct task_struct *next;
+        BUG_ON(!rq->curr);
         if (rq->curr && is_realtime(rq->curr))
                 update_time_litmus(rq, rq->curr);
 
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index d4013aed6196..b76e46372c6a 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -11,10 +11,9 @@
 #include <linux/spinlock.h>
 #include <linux/percpu.h>
 #include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/sched/topology.h>
-#include <linux/wait.h>
 #include <linux/sched/signal.h>
+#include <linux/sched/topology.h>
+#include <linux/slab.h>
 
 #include <litmus/debug_trace.h>
 #include <litmus/litmus.h>
@@ -807,8 +806,7 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
                 /* FIXME: interruptible would be nice some day */
                 set_current_state(TASK_UNINTERRUPTIBLE);
 
-                wait.flags |= WQ_FLAG_EXCLUSIVE;
-                __add_wait_queue_entry_tail(&sem->wait, &wait);
+                __add_wait_queue_entry_tail_exclusive(&sem->wait, &wait);
 
                 /* check if we need to activate priority inheritance */
                 if (edf_higher_prio(t, sem->hp_waiter)) {
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index b5a3814b572f..635639fb187f 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -415,8 +415,7 @@ int psnedf_fmlp_lock(struct litmus_lock* l)
                 /* FIXME: interruptible would be nice some day */
                 set_current_state(TASK_UNINTERRUPTIBLE);
 
-                wait.flags |= WQ_FLAG_EXCLUSIVE;
-                __add_wait_queue_entry_tail(&sem->wait, &wait);
+                __add_wait_queue_entry_tail_exclusive(&sem->wait, &wait);
 
                 TS_LOCK_SUSPEND;