Fixed scheduling overhead macros for mixed-criticality.

2 files changed, 4 insertions, 3 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index d868144f6928..61332b5f7c50 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -10,7 +10,7 @@
 /*********************** TIMESTAMPS ************************/
 
 enum task_type_marker {
-        TSK_BE,
+        TSK_BE = 0,
         TSK_RT,
         TSK_UNKNOWN,
         TSK_LVLA,
@@ -23,9 +23,9 @@ struct timestamp {
         uint32_t                seq_no;
         uint8_t                 cpu;
         uint8_t                 event;
-        uint8_t                 task_type:2;
+        uint8_t                 task_type:3;
         uint8_t                 irq_flag:1;
-        uint8_t                 irq_count:5;
+        uint8_t                 irq_count:4;
 };
 
 /* tracing callbacks */
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 8028ce85e2dd..03a214f70233 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -673,6 +673,7 @@ static void job_completion(struct task_struct *task, int forced)
         if (!forced) {
                 /* Userspace signaled job completion */
                 sched_trace_task_completion(current, 0);
+                mb();
                 setup_user_release(current, get_user_deadline(current));
 
         }