Full patch for klitirqd with Nvidia GPU support.

2 files changed, 15 insertions, 0 deletions

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 91fd0c70a18a..50abbc6b7429 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -8,6 +8,10 @@
 #include <linux/smp.h>
 #include <linux/ftrace.h>
 
+#ifdef CONFIG_LITMUS_NVIDIA
+#include <litmus/sched_trace.h>
+#endif
+
 #include <asm/apic.h>
 #include <asm/io_apic.h>
 #include <asm/irq.h>
@@ -244,7 +248,17 @@ 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/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index 37702905f658..b5ddae40cee2 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -352,3 +352,4 @@ ENTRY(sys_call_table)
         .long sys_wait_for_ts_release
         .long sys_release_ts
         .long sys_null_call
+        .long sys_register_nv_device