3 files changed, 3 insertions, 11 deletions

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 50abbc6b7429..433cd154333c 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -248,17 +248,7 @@ unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
                                 __func__, smp_processor_id(), vector, irq);
         }
 
-//#ifndef CONFIG_LITMUS_NVIDIA
         irq_exit();
-//#else
-        /* skip softirqs if we're tracing an interrupt top-half */
-        /* comment out if-statement if we want to trace with bh on. */
-        //if(!is_interrupt_tracing_active())
-//      irq_exit();
-
-
-//      sched_trace_nv_interrupt_end();
-//#endif
 
         set_irq_regs(old_regs);
         return 1;
diff --git a/kernel/softirq.c b/kernel/softirq.c
index d3217c54d2bf..7a6f500570f1 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -439,6 +439,7 @@ void __tasklet_schedule(struct tasklet_struct *t)
 
                                 t->owner = device_owner;
                                 sched_trace_tasklet_release(t->owner);
+
                                 if(likely(_litmus_tasklet_schedule(t,nvidia_device)))
                                 {
                                         unlock_nv_registry(nvidia_device, &flags);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 637cadac2627..2293aadbb1ab 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2531,6 +2531,7 @@ EXPORT_SYMBOL(cancel_delayed_work_sync);
  */
 int schedule_work(struct work_struct *work)
 {
+#if 0
 #if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD)
         if(is_nvidia_func(work->func))
         {
@@ -2583,7 +2584,7 @@ int schedule_work(struct work_struct *work)
                 unlock_nv_registry(nvidiaDevice, &flags);
         }
 #endif
-
+#endif
         return(__schedule_work(work));
 }
 EXPORT_SYMBOL(schedule_work);