Allow events to be cancelled when their list is processed

1 files changed, 3 insertions, 2 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 61eb961eda23..1d1ecbb8c9c4 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -407,10 +407,10 @@ static void preempt(struct domain *dom, struct crit_entry *ce)
         TRACE_CRIT_ENTRY(ce, "Preempted by " TS "\n", TA(task));
 
         /* Per-domain preemption */
+        link_task_to_crit(ce, task);
         if (old && can_requeue(old)) {
                 dom->requeue(dom, old);
         }
-        link_task_to_crit(ce, task);
         update_crit_position(ce);
 
         /* Preempt actual execution if this is a running task */
@@ -987,7 +987,8 @@ void mc_finish_switch(struct task_struct *prev)
 {
         struct cpu_entry* entry = &__get_cpu_var(cpus);
         entry->scheduled = is_realtime(current) ? current : NULL;
-        TRACE_TASK(prev, "Switched away from\n");
+        TRACE_TASK(prev, "Switched away from to (something/%d)\n",
+                   ((entry->scheduled) ? entry->scheduled->pid : 0));
 }
 
 /*