Check for criticality in sched_mcrit

As opposed to edf_common

3 files changed, 7 insertions, 7 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index ae55a7525105..afa71d5aa71d 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -122,7 +122,6 @@ static inline lt_t litmus_clock(void)
         (lt_before_eq(tsk_rt(t)->job_params.deadline, now))
 
 /* real-time comparison macros */
-#define higher_criticality(a, b) ( get_crit(a) < get_crit(b) )
 #define earlier_deadline(a, b) (lt_before(\
         (a)->rt_param.job_params.deadline,\
         (b)->rt_param.job_params.deadline))
diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index eb8bc1499d92..06daec66c984 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -50,11 +50,6 @@ int edf_higher_prio(struct task_struct* first,
                  */
                 !second_task || !is_realtime(second_task)  ||
 
-        /* is the criticality of the first task higher?
-         * Then it has higher priority.
-        */
-        higher_criticality(first_task, second_task) ||
-
                 /* is the deadline of the first task earlier?
                  * Then it has higher priority.
                  */
diff --git a/litmus/sched_mcrit.c b/litmus/sched_mcrit.c
index 6c93af723f54..cc2185d0d12d 100644
--- a/litmus/sched_mcrit.c
+++ b/litmus/sched_mcrit.c
@@ -133,7 +133,13 @@ static int cpu_lower_prio(struct bheap_node *_a, struct bheap_node *_b)
         /* Note that a and b are inverted: we want the lowest-priority CPU at
          * the top of the heap.
          */
-        return edf_higher_prio(b->linked, a->linked);
+     
+    if (get_crit(b->linked) == get_crit(a->linked)) {
+        return edf_higher_prio(b->linked, a->linked);
+     }
+    else {
+        return get_crit(b->linked) < get_crit(a->linked); /* lower criticality number == higher criticality */
+    }
 }
 
 /* update_cpu_position - Move the cpu entry to the correct place to maintain