1 files changed, 4 insertions, 14 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index b32c71180774..05f487263f28 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -91,20 +91,10 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
 #define TS_EXIT_NP_START                TIMESTAMP(150)
 #define TS_EXIT_NP_END                  TIMESTAMP(151)
 
-#define TS_SRP_UP_START                 TIMESTAMP(160)
-#define TS_SRP_UP_END                   TIMESTAMP(161)
-#define TS_SRP_DOWN_START               TIMESTAMP(162)
-#define TS_SRP_DOWN_END                 TIMESTAMP(163)
-
-#define TS_PI_UP_START                  TIMESTAMP(170)
-#define TS_PI_UP_END                    TIMESTAMP(171)
-#define TS_PI_DOWN_START                TIMESTAMP(172)
-#define TS_PI_DOWN_END                  TIMESTAMP(173)
-
-#define TS_FIFO_UP_START                TIMESTAMP(180)
-#define TS_FIFO_UP_END                  TIMESTAMP(181)
-#define TS_FIFO_DOWN_START              TIMESTAMP(182)
-#define TS_FIFO_DOWN_END                TIMESTAMP(183)
+#define TS_LOCK_START                   TIMESTAMP(170)
+#define TS_LOCK_END                     TIMESTAMP(171)
+#define TS_UNLOCK_START                 TIMESTAMP(172)
+#define TS_UNLOCK_END                   TIMESTAMP(173)
 
 #define TS_SEND_RESCHED_START(c)        CTIMESTAMP(190, c)
 #define TS_SEND_RESCHED_END             DTIMESTAMP(191, TSK_UNKNOWN)