1 files changed, 27 insertions, 18 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index 4b65be7302be..989757cdcc5c 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -103,24 +103,33 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
 //        (first_task->pid == second_task->pid &&
 //         !second->rt_param.inh_task)));
 
-        return !is_realtime(second_task)  ||
-
-                /* is the deadline of the first task earlier?
-                 * Then it has higher priority.
-                 */
-                earlier_deadline(first_task, second_task) ||
-
-                /* Do we have a deadline tie?
-                 * Then break by PID.
-                 */
-                (get_deadline(first_task) == get_deadline(second_task) &&
-                (first_task->pid < second_task->pid ||
-
-                /* If the PIDs are the same then the task with the EFFECTIVE
-                 * priority wins.
-                 */
-                (first_task->pid == second_task->pid &&
-                 !second->rt_param.inh_task)));
+        if (!is_realtime(second_task))
+                return true;
+
+        if (earlier_deadline(first_task, second_task))
+                return true;
+
+        if (get_deadline(first_task) == get_deadline(second_task)) {
+                if (shorter_period(first_task, second_task)) {
+                        return true;
+                }
+                if (get_rt_period(first_task) == get_rt_period(second_task)) {
+#ifdef CONFIG_LITMUS_SOFTIRQD
+                        if (first_task->rt_param.is_proxy_thread <
+                                                        second_task->rt_param.is_proxy_thread) {
+                                return true;
+                        }
+#endif      
+                        if (first_task->pid < second_task->pid) {   
+                                return true;
+                        }
+                        if (first_task->pid == second_task->pid) {
+                                return !second->rt_param.inh_task;
+                        }
+                }
+        }
+        
+        return false;
 }