Merge branch 'wip-gpu-cleanup' into wip-2012.3-gpu

Conflicts:
	include/litmus/fpmath.h
	include/litmus/litmus.h
	include/litmus/rt_param.h
	include/litmus/trace.h
	kernel/sched.c
	kernel/softirq.c
	litmus/edf_common.c
	litmus/jobs.c
	litmus/litmus.c
	litmus/locking.c
	litmus/preempt.c
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c
	litmus/sched_litmus.c
	litmus/sync.c

1 files changed, 25 insertions, 0 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 8ad4966c602e..15bd645d2466 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -137,9 +137,34 @@ feather_callback void save_timestamp_hide_irq(unsigned long event);
 #define TS_EXIT_NP_START                TIMESTAMP(150)
 #define TS_EXIT_NP_END                  TIMESTAMP(151)
 
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+#define TS_DGL_LOCK_START                       TIMESTAMP(175)
+#define TS_DGL_LOCK_SUSPEND                     TIMESTAMP(176)
+#define TS_DGL_LOCK_RESUME                      TIMESTAMP(177)
+#define TS_DGL_LOCK_END                         TIMESTAMP(178)
+#define TS_DGL_UNLOCK_START                     TIMESTAMP(185)
+#define TS_DGL_UNLOCK_END                       TIMESTAMP(186)
+#endif
+
 #define TS_SEND_RESCHED_START(c)        CTIMESTAMP(190, c)
 #define TS_SEND_RESCHED_END             TIMESTAMP_IN_IRQ(191)
 
+#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
+
 #define TS_RELEASE_LATENCY(when)        LTIMESTAMP(208, &(when))
 
 #endif /* !_SYS_TRACE_H_ */