1 files changed, 17 insertions, 19 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index b2a9ca205be4..f360abf34035 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -183,7 +183,7 @@ static void update_ghost_time(struct task_struct *p)
 static inline void update_crit_position(struct crit_entry *ce)
 {
         struct bheap *heap;
-        if (is_global(ce->domain)) {
+        if (is_global(ce->domain) && ce->usable) {
                 heap = domain_data(ce->domain)->heap;
                 BUG_ON(!heap);
                 BUG_ON(!bheap_node_in_heap(ce->node));
@@ -451,9 +451,18 @@ static void check_for_preempt(struct domain *dom)
                         entry = crit_cpu(ce);
                         preempted = 0;
                         raw_spin_lock(&entry->lock);
-                        if (ce->usable && dom->preempt_needed(dom, ce->linked)){
+
+                        if (!ce->usable) {
+                                TRACE_CRIT_ENTRY(ce, "Removing");
+                                bheap_delete(cpu_lower_prio,
+                                             domain_data(dom)->heap, ce->node);
+                                continue;
+                        }
+                        if (dom->preempt_needed(dom, ce->linked)){
                                 preempted = 1;
                                 preempt(dom, ce);
+                        } else {
+                                TRACE_CRIT_ENTRY(ce, "Stopped global check\n");
                         }
                         raw_spin_unlock(&entry->lock);
                 }
@@ -486,10 +495,10 @@ static void remove_from_all(struct task_struct* task)
 
         raw_spin_lock(dom->lock);
 
+        /* Remove the task from any CPU state */
         if (task->rt_param.linked_on != NO_CPU) {
                 entry = &per_cpu(cpus, task->rt_param.linked_on);
                 raw_spin_lock(&entry->lock);
-
                 /* Unlink only if task is still linked post lock */
                 ce = &entry->crit_entries[tsk_mc_crit(task)];
                 if (task->rt_param.linked_on != NO_CPU) {
@@ -501,23 +510,15 @@ static void remove_from_all(struct task_struct* task)
                                 link_task_to_cpu(entry, NULL);
                         }
                 }
-
                 if (update)
                         update_crit_levels(entry);
                 else
                         raw_spin_unlock(&entry->lock);
         }
 
-        if (is_queued(task)) {
-                /* This is an interesting situation: t is scheduled,
-                 * but was just recently unlinked. It cannot be
-                 * linked anywhere else (because then it would have
-                 * been relinked to this CPU), thus it must be in some
-                 * queue. We must remove it from the list in this
-                 * case.
-                 */
-                remove((rt_domain_t*)get_task_domain(task)->data, task);
-        }
+        /* Ensure the task isn't returned by its domain */
+        dom->remove(dom, task);
+
         BUG_ON(is_queued(task));
         raw_spin_unlock(dom->lock);
 }
@@ -853,12 +854,9 @@ static struct task_struct* mc_schedule(struct task_struct * prev)
 
         if (exists) {
                 entry->scheduled->rt_param.scheduled_on = NO_CPU;
-                TRACE(TS
-                      " blocks:%d out_of_time:%d sleep:%d preempt:%d "
-                      "state:%d sig:%d global:%d\n", TA(prev),
-                      blocks, out_of_time, sleep, preempt,
-                      prev->state, signal_pending(prev), global);
         }
+        TRACE(TS " blocks:%d out_of_time:%d sleep:%d preempt:%d\n",
+              TA(prev), blocks, out_of_time, sleep, preempt);
         raw_spin_unlock(&entry->lock);