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

Conflicts:
	include/litmus/fdso.h
	include/litmus/rt_param.h
	include/litmus/sched_plugin.h
	include/litmus/unistd_32.h
	include/litmus/unistd_64.h
	litmus/Makefile
	litmus/edf_common.c
	litmus/litmus.c
	litmus/locking.c
	litmus/sched_gsn_edf.c
	litmus/sched_plugin.c

1 files changed, 5 insertions, 1 deletions

diff --git a/litmus/Makefile b/litmus/Makefile
index c2449a761ea4..91fd32cb979d 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -18,7 +18,8 @@ obj-y     = sched_plugin.o litmus.o \
         binheap.o \
             ctrldev.o \
             sched_gsn_edf.o \
-            sched_psn_edf.o
+            sched_psn_edf.o \
+        kfmlp_lock.o
 
 obj-$(CONFIG_PLUGIN_CEDF) += sched_cedf.o
 obj-$(CONFIG_PLUGIN_PFAIR) += sched_pfair.o
@@ -30,3 +31,6 @@ obj-$(CONFIG_SCHED_DEBUG_TRACE) += sched_trace.o
 obj-$(CONFIG_SCHED_OVERHEAD_TRACE) += trace.o
 
 obj-$(CONFIG_LITMUS_NESTED_LOCKING) += rsm_lock.o ikglp_lock.o
+obj-$(CONFIG_LITMUS_SOFTIRQD) += litmus_softirq.o
+obj-$(CONFIG_LITMUS_PAI_SOFTIRQD) += litmus_pai_softirq.o
+obj-$(CONFIG_LITMUS_NVIDIA) += nvidia_info.o sched_trace_external.o