1 files changed, 21 insertions, 24 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 15909e530771..0e050ac3748c 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -196,21 +196,17 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
 #define trace_litmus_switch_to(t)
 #define trace_litmus_switch_away(prev)
 #define trace_litmus_task_completion(t, forced)
+
 #define trace_litmus_task_block(t, i)
 #define trace_litmus_task_resume(t, i)
 #define trace_litmus_sys_release(start)
-
 #define trace_litmus_task_exit(t)
 #define trace_litmus_task_tardy(t)
 
-#define trace_litmus_resource_acquire(t, i);
-#define trace_litmus_resource_release(t, i);
-#define trace_litmus_priority_donate(t, d, i)
-
 #define trace_litmus_container_param(cid, name)
 #define trace_litmus_server_param(sid, cid, wcet, time)
-#define trace_litmus_server_switch_to(sid, job, tid, tjob)
-#define trace_litmus_server_switch_away(sid, job, tid, tjob)
+#define trace_litmus_server_switch_to(sid, job, tid)
+#define trace_litmus_server_switch_away(sid, job, tid)
 #define trace_litmus_server_release(sid, job, release, deadline)
 #define trace_litmus_server_completion(sid, job)
 
@@ -260,20 +256,36 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                 trace_litmus_task_completion(t, forced);                \
         } while (0)
 
-#define sched_trace_task_block(t, i)                                    \
+#define sched_trace_task_block_on(t, i)                                 \
         do {                                                            \
                 SCHED_TRACE(SCHED_TRACE_BASE_ID + 7,                    \
                         do_sched_trace_task_block, t);                  \
                 trace_litmus_task_block(t, i);                          \
         } while (0)
 
-#define sched_trace_task_resume(t, i)                                   \
+#define sched_trace_task_block(t)                                       \
+        sched_trace_task_block_on(t, 0)
+
+#define sched_trace_task_resume_on(t, i)                                \
         do {                                                            \
                 SCHED_TRACE(SCHED_TRACE_BASE_ID + 8,                    \
                                 do_sched_trace_task_resume, t);         \
                 trace_litmus_task_resume(t, i);                         \
         } while (0)
 
+#define sched_trace_task_resume(t)                                      \
+        sched_trace_task_resume_on(t, 0)
+
+#define sched_trace_resource_acquire(t, i)                              \
+        do {                                                            \
+                trace_litmus_resource_acquire(t, i);                    \
+        } while (0)
+
+#define sched_trace_resource_released(t, i)                             \
+        do {                                                            \
+                trace_litmus_resource_released(t, i);                   \
+        } while (0)
+
 #define sched_trace_action(t, action)                                   \
         SCHED_TRACE2(SCHED_TRACE_BASE_ID + 9,                           \
                 do_sched_trace_action, t, (unsigned long) action);
@@ -305,21 +317,6 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
         sched_trace_log_message("%d P%d      [%s@%s:%d]: Took %llu\n\n", \
                 TRACE_ARGS, litmus_clock() - _qt_start)
 
-#define sched_trace_resource_acquire(t, i)                              \
-        do {                                                            \
-                trace_litmus_resource_acquire(t, i);                    \
-        } while (0)
-
-#define sched_trace_resource_release(t, i)                              \
-        do {                                                            \
-                trace_litmus_resource_release(t, i);                    \
-        } while (0)
-
-#define sched_trace_priority_donate(t, d, i)                            \
-        do {                                                            \
-                trace_litmus_priority_donate(t, d, i);                  \
-        } while (0)
-
 #define sched_trace_container_param(cid, name)                          \
         do {                                                            \
                 trace_litmus_container_param(cid, name);                \