Feather-Trace: make SCHED only depend on next

2 files changed, 6 insertions, 3 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 5753ceebb0..2c8e1419de 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -57,7 +57,10 @@ feather_callback void save_timestamp_task(unsigned long event, unsigned long t_p
  * always the next number after the start time event id.
  */
 
-#define TS_SCHED_START(t)               TTIMESTAMP(100, t)
+#define TS_SCHED_START                  DTIMESTAMP(100, TSK_UNKNOWN) /* we only
+                                                                      * care
+                                                                      * about
+                                                                      * next */
 #define TS_SCHED_END(t)                 TTIMESTAMP(101, t)
 #define TS_SCHED2_START(t)              TTIMESTAMP(102, t)
 #define TS_SCHED2_END(t)                TTIMESTAMP(103, t)
diff --git a/kernel/sched.c b/kernel/sched.c
index 7f1de34b1c..9ee07ba365 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3654,7 +3654,7 @@ need_resched:
 
         release_kernel_lock(prev);
 need_resched_nonpreemptible:
-        TS_SCHED_START(prev);
+        TS_SCHED_START;
 
         schedule_debug(prev);
 
@@ -3693,7 +3693,7 @@ need_resched_nonpreemptible:
                 ++*switch_count;
 
                 TS_SCHED_END(next);
-                TS_CXS_START(prev);
+                TS_CXS_START(next);
                 context_switch(rq, prev, next); /* unlocks the rq */
                 TS_CXS_END(current);
         } else {