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

1 files changed, 11 insertions, 2 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index fb339c8d3e7..c8677f688f7 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -667,6 +667,7 @@ static void check_partitioned_preempt(struct domain *dom)
                 return;
         }
 
+        entry->signal.preempt = 1;
         litmus_reschedule(entry->cpu);
 }
 
@@ -1263,8 +1264,16 @@ static void process_signals(struct cpu_entry *entry)
                 /* A higher-priority task may exist */
                 STRACE("Reading preempt signal\n");
 
-                check_partitioned_preempt(dom);
-                raw_spin_unlock(dom->lock);
+                if (mc_preempt_needed(ce->domain, ce->server.linked)) {
+                        preempt_crit(ce->domain, ce);
+                        raw_spin_unlock(dom->lock);
+                        if (!is_ghost(ce->server.linked)) {
+                                update_crit_levels(entry);
+                                raw_spin_lock(&entry->lock);
+                        }
+                } else {
+                        raw_spin_unlock(dom->lock);
+                }
         }
 
         if (signal.update) {