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

1 files changed, 20 insertions, 0 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index e809376d6487..baa542d0135a 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -113,4 +113,24 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
 
 #define TS_RELEASE_LATENCY(when)        LTIMESTAMP(208, &(when))
 
+
+#ifdef CONFIG_LITMUS_NVIDIA
+
+#define TS_NV_TOPISR_START              TIMESTAMP(200)
+#define TS_NV_TOPISR_END                TIMESTAMP(201)
+
+#define TS_NV_BOTISR_START              TIMESTAMP(202)
+#define TS_NV_BOTISR_END                TIMESTAMP(203)
+
+#define TS_NV_RELEASE_BOTISR_START      TIMESTAMP(204)
+#define TS_NV_RELEASE_BOTISR_END        TIMESTAMP(205)
+
+#endif
+
+#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
+#define TS_NV_SCHED_BOTISR_START        TIMESTAMP(206)
+#define TS_NV_SCHED_BOTISR_END          TIMESTAMP(207)
+#endif
+
+
 #endif /* !_SYS_TRACE_H_ */