1 files changed, 45 insertions, 0 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index 9b44dc2d8d1e..0a06d7a26c00 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -63,8 +63,52 @@ int edf_higher_prio(struct task_struct* first,
 
 #endif
 
+        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;
+                        }
+                        if (first_task->rt_param.is_proxy_thread == second_task->rt_param.is_proxy_thread)
+                        {
+#endif      
+                        if (first_task->pid < second_task->pid)
+                        {   
+                                return true;
+                        }
+                        if (first_task->pid == second_task->pid)
+                        {
+                                return !second->rt_param.inh_task;
+                        }
+#ifdef CONFIG_LITMUS_SOFTIRQD
+                        }
+#endif
+                }
+        }
+        
+        return false;
 
+#if 0
         return !is_realtime(second_task)  ||
+    
+#ifdef CONFIG_LITMUS_SOFTIRQD
+        /* proxy threads always lose w/o inheritance. */
+        (first_task->rt_param.is_proxy_thread <
+            second_task->rt_param.is_proxy_thread) ||
+#endif
 
                 /* is the deadline of the first task earlier?
                  * Then it has higher priority.
@@ -82,6 +126,7 @@ int edf_higher_prio(struct task_struct* first,
                  */
                 (first_task->pid == second_task->pid &&
                  !second->rt_param.inh_task)));
+#endif
 }
 
 int edf_ready_order(struct bheap_node* a, struct bheap_node* b)