Merge remote-tracking branch 'litmus-rt/wip-mc' into litmus-rt-wip-mc

2 files changed, 7 insertions, 4 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
index f8b5559ce54..097d7dd94d1 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -135,6 +135,8 @@ long complete_job(void)
                 ++tsk_rt(current)->missed;
         }
 
+        TRACE_TASK(current, "user complete\n");
+
         /* Mark that we do not execute anymore */
         tsk_rt(current)->completed = 1;
         tsk_rt(current)->flags = RT_F_SLEEP;
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 0394618dbc9..85be5e17ad0 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -778,7 +778,8 @@ static void job_completion(struct task_struct *task, int forced)
                 remove_from_all(task);
         }
 
-        if (lt_before(get_user_release(task), litmus_clock())) {
+        if (lt_before(get_user_release(task), litmus_clock()) ||
+            (release_server && tsk_rt(task)->completed)){
                 TRACE_TASK(task, "Executable task going back to running\n");
                 tsk_rt(task)->completed = 0;
         }
@@ -1294,11 +1295,11 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
 
         BUG_ON(entry->scheduled && entry->scheduled != prev);
         BUG_ON(entry->scheduled && !is_realtime(prev));
-        BUG_ON(is_realtime(prev) && !entry->scheduled);
+        BUG_ON(prev && is_realtime(prev) && !entry->scheduled);
 
         if (entry->scheduled != NULL) {
-                prev->rt_param.scheduled_on = NO_CPU;
-                update_server_time(prev);
+                entry->scheduled->rt_param.scheduled_on = NO_CPU;
+                update_server_time(entry->scheduled);
         }
 
         /* Determine state */