PAI implementation, C-RM, C-FIFO.

3 files changed, 8 insertions, 2 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 3162605ffc91..3aa2be09122b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3897,8 +3897,10 @@ need_resched_nonpreemptible:
         if (need_resched())
                 goto need_resched;
 
+#ifdef LITMUS_SOFTIRQD
         reacquire_klitirqd_lock(prev);
-        
+#endif
+
         srp_ceiling_block();
 }
 EXPORT_SYMBOL(schedule);
diff --git a/kernel/softirq.c b/kernel/softirq.c
index be4b8fab3637..ae77c5c1d17e 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -35,6 +35,7 @@
 
 #ifdef CONFIG_LITMUS_NVIDIA
 #include <litmus/nvidia_info.h>
+#include <litmus/trace.h>
 #endif
 
 /*
@@ -441,6 +442,9 @@ void __tasklet_schedule(struct tasklet_struct *t)
                                 if(likely(_litmus_tasklet_schedule(t,nvidia_device)))
                                 {
                                         unlock_nv_registry(nvidia_device, &flags);
+
+                                        TS_NV_RELEASE_BOTISR_END;
+
                                         return;
                                 }
                                 else
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 8139208eaee1..637cadac2627 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL(cancel_delayed_work_sync);
  */
 int schedule_work(struct work_struct *work)
 {
-#ifdef CONFIG_LITMUS_NVIDIA
+#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD)
         if(is_nvidia_func(work->func))
         {
                 u32 nvidiaDevice = get_work_nv_device_num(work);