4 files changed, 6 insertions, 6 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 6fb923bc5241..ae925fbda849 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -205,8 +205,8 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
 
 #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)
-#define trace_litmus_server_switch_away(sid, job, tid)
+#define trace_litmus_server_switch_to(sid, job, tid, tjob)
+#define trace_litmus_server_switch_away(sid, job, tid, tjob)
 #define trace_litmus_server_release(sid, job, release, deadline)
 #define trace_litmus_server_completion(sid, job)
 
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 6553948407de..0be9a573003d 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -12,6 +12,7 @@ static void update_time_litmus(struct rq *rq, struct task_struct *p)
                 delta = 0;
         /* per job counter */
         p->rt_param.job_params.exec_time += delta;
+        p->rt_param.user_job.exec_time += delta;
         /* task counter */
         p->se.sum_exec_runtime += delta;
         /* sched_clock() */
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 03a214f70233..065c767be846 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -673,7 +673,6 @@ 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));
 
         }
@@ -681,10 +680,10 @@ static void job_completion(struct task_struct *task, int forced)
         release_server = budget_exhausted(task);
 #ifndef CONFIG_PLUGIN_MC_LINUX_SLACK_STEALING
         /* Release lowest-criticality task's servers with their userspace tasks,
-         * preventing them from getting behind userspace and forcing idleness
+         * preventing them from turning into ghost tasks and forcing idleness
          */
         if (tsk_mc_crit(task) == NUM_CRIT_LEVELS - 1)
-                release_server = 1;
+                release_server |= is_ghost(task);
 #endif
 
         /* If server has run out of budget, wait until next release
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index d6487d3b7837..3f4a0a1081c3 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -198,7 +198,7 @@ feather_callback void do_sched_trace_task_completion(unsigned long id,
         struct task_struct *t = (struct task_struct*) _task;
         struct st_event_record* rec = get_record(ST_COMPLETION, t);
         if (rec) {
-                rec->data.completion.when   = get_exec_time(t);
+                rec->data.completion.when   = tsk_rt(t)->user_job.exec_time;
                 rec->data.completion.forced = forced;
                 put_record(rec);
         }