Merge branch 'wip-pai' into wip-gpu-interrupts

Conflicts:
	include/litmus/affinity.h
	kernel/sched.c
	kernel/softirq.c
	litmus/Kconfig
	litmus/affinity.c
	litmus/litmus.c
	litmus/preempt.c
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c

2 files changed, 5 insertions, 0 deletions

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 6c0802eb2f7f..680a5cb4b585 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -10,6 +10,10 @@
 #include <linux/ftrace.h>
 #include <linux/delay.h>
 
+#ifdef CONFIG_LITMUS_NVIDIA
+#include <litmus/sched_trace.h>
+#endif
+
 #include <asm/apic.h>
 #include <asm/io_apic.h>
 #include <asm/irq.h>
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index d0126222b394..0cb4373698e7 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -358,3 +358,4 @@ ENTRY(sys_call_table)
         .long sys_wait_for_ts_release
         .long sys_release_ts            /* +10 */
         .long sys_null_call
+        .long sys_register_nv_device