1 files changed, 27 insertions, 0 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 2229d0deec4b..9e8d8698323b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -86,6 +86,10 @@
 #include <litmus/sched_trace.h>
 #include <litmus/trace.h>
 
+#ifdef CONFIG_LITMUS_SOFTIRQD
+#include <litmus/litmus_softirq.h>
+#endif
+
 static void litmus_tick(struct rq*, struct task_struct*);
 
 /*
@@ -4305,6 +4309,7 @@ pick_next_task(struct rq *rq)
         BUG(); /* the idle class will always have a runnable task */
 }
 
+
 /*
  * schedule() is the main scheduler function.
  */
@@ -4323,6 +4328,10 @@ need_resched:
         rcu_note_context_switch(cpu);
         prev = rq->curr;
 
+#ifdef CONFIG_LITMUS_SOFTIRQD
+        release_klitirqd_lock(prev);
+#endif
+
         /* LITMUS^RT: quickly re-evaluate the scheduling decision
          * if the previous one is no longer valid after CTX.
          */
@@ -4411,13 +4420,24 @@ litmus_need_resched_nonpreemptible:
                 goto litmus_need_resched_nonpreemptible;
 
         preempt_enable_no_resched();
+
         if (need_resched())
                 goto need_resched;
 
+#ifdef LITMUS_SOFTIRQD
+        reacquire_klitirqd_lock(prev);
+#endif
+
+#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
+        litmus->run_tasklets(prev);
+#endif  
+        
         srp_ceiling_block();
 }
 EXPORT_SYMBOL(schedule);
 
+
+
 #ifdef CONFIG_MUTEX_SPIN_ON_OWNER
 
 static inline bool owner_running(struct mutex *lock, struct task_struct *owner)
@@ -4561,6 +4581,7 @@ static void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
         }
 }
 
+
 /**
  * __wake_up - wake up threads blocked on a waitqueue.
  * @q: the waitqueue
@@ -4747,6 +4768,12 @@ void __sched wait_for_completion(struct completion *x)
 }
 EXPORT_SYMBOL(wait_for_completion);
 
+void __sched __wait_for_completion_locked(struct completion *x)
+{
+        do_wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE);
+}
+EXPORT_SYMBOL(__wait_for_completion_locked);
+
 /**
  * wait_for_completion_timeout: - waits for completion of a task (w/timeout)
  * @x:  holds the state of this particular completion