make klmirqd work like aux tasks. checkpoint.

this code is untested!

2 files changed, 14 insertions, 8 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 251c89eaf24e..840f87bce097 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4340,10 +4340,6 @@ 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.
          */
@@ -4444,10 +4440,6 @@ litmus_need_resched_nonpreemptible:
         if (need_resched())
                 goto need_resched;
 
-#ifdef LITMUS_SOFTIRQD
-        reacquire_klitirqd_lock(prev);
-#endif
-
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
         litmus->run_tasklets(prev);
 #endif
diff --git a/kernel/softirq.c b/kernel/softirq.c
index b013046e8c36..053aec196a50 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -403,11 +403,13 @@ void open_softirq(int nr, void (*action)(struct softirq_action *))
 /*
  * Tasklets
  */
+/*
 struct tasklet_head
 {
         struct tasklet_struct *head;
         struct tasklet_struct **tail;
 };
+*/
 
 static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
 static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
@@ -522,6 +524,11 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
 #ifdef CONFIG_LITMUS_NVIDIA
         if(is_nvidia_func(t->func))
         {       
+#if 1
+                // do nvidia tasklets right away and return
+                if(__do_nv_now(t))
+                        return;
+#else
                 u32 nvidia_device = get_tasklet_nv_device_num(t);
                 //              TRACE("%s: Handling NVIDIA tasklet for device\t%u\tat\t%llu\n",
                 //                        __FUNCTION__, nvidia_device,litmus_clock());
@@ -564,6 +571,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
                         }
                 }
                 unlock_nv_registry(nvidia_device, &flags);
+#endif
         }
 #endif
 
@@ -590,6 +598,11 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
 #ifdef CONFIG_LITMUS_NVIDIA     
         if(is_nvidia_func(t->func))
         {       
+#if 1
+                // do nvidia tasklets right away and return
+                if(__do_nv_now(t))
+                        return;
+#else
                 u32 nvidia_device = get_tasklet_nv_device_num(t);
                 //              TRACE("%s: Handling NVIDIA tasklet for device\t%u\tat\t%llu\n",
                 //                        __FUNCTION__, nvidia_device,litmus_clock());
@@ -632,6 +645,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
                         }
                 }
                 unlock_nv_registry(nvidia_device, &flags);
+#endif
         }
 #endif