1 files changed, 23 insertions, 9 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index 9b44dc2d8d1e..6ed927fcce6d 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -14,6 +14,17 @@
 
 #include <litmus/edf_common.h>
 
+#ifdef DONT_PREEMPT_ON_TIE
+static inline cur_sched_higher_prio(
+        struct task_struct* first,
+        struct task_struct* second)
+{
+        int first_is_sched = (tsk_rt(first)->scheduled_on != NO_CPU);
+        int second_is_sched = (tsk_rt(second)->scheduled_on != NO_CPU);
+        return(first_is_sched > second_is_sched);
+}
+#endif
+
 /* edf_higher_prio -  returns true if first has a higher EDF priority
  *                    than second. Deadline ties are broken by PID.
  *
@@ -71,17 +82,20 @@ int edf_higher_prio(struct task_struct* first,
                  */
                 earlier_deadline(first_task, second_task) ||
 
-                /* Do we have a deadline tie?
-                 * Then break by PID.
-                 */
+                /* tie-break order: cur scheduled, pid, inheritance */
                 (get_deadline(first_task) == get_deadline(second_task) &&
+#ifdef DONT_PREEMPT_ON_TIE
+                        (cur_sched_higher_prio(first, second) ||
+#endif
                 (first_task->pid < second_task->pid ||
-
-                /* If the PIDs are the same then the task with the inherited
-                 * priority wins.
-                 */
-                (first_task->pid == second_task->pid &&
-                 !second->rt_param.inh_task)));
+                                (first_task->pid == second_task->pid &&
+                                        !second->rt_param.inh_task
+                                )
+                        )
+#ifdef DONT_PREEMPT_ON_TIE
+                        )
+#endif
+                );
 }
 
 int edf_ready_order(struct bheap_node* a, struct bheap_node* b)