1 files changed, 20 insertions, 4 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index f4881452373d..916b1b4309b7 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -92,10 +92,20 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
 
 #ifdef CONFIG_REALTIME_AUX_TASKS
         {
-        /* statically prioritize all auxillary tasks that have no inheritance
-         * below all other regular real-time tasks.
-         */
 
+        /* run aux tasks at max priority */
+        if (first->rt_param.is_aux_task != second->rt_param.is_aux_task)
+        {
+                return (first->rt_param.is_aux_task > second->rt_param.is_aux_task);
+        }
+        else if(first->rt_param.is_aux_task && second->rt_param.is_aux_task)
+        {
+                first = first->group_leader;
+                second = second->group_leader;
+        }
+
+
+#if 0
         int first_lo_aux, second_lo_aux;
         int first_hi_aux, second_hi_aux;
         first_lo_aux = first->rt_param.is_aux_task && !first->rt_param.inh_task;
@@ -123,6 +133,8 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                 TRACE_CUR("hi aux tie break: %s/%d >> %s/%d --- %d\n", first->comm, first->pid, second->comm, second->pid, aux_hi_tie_break);
                 return aux_hi_tie_break;
         }
+#endif
+
         }
 #endif
 
@@ -240,6 +252,7 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                                 else if (first_task->rt_param.is_proxy_thread == second_task->rt_param.is_proxy_thread) {
 #endif
 
+#if 0
 #ifdef CONFIG_REALTIME_AUX_TASKS
                                 /* is this dead code? */
                                 if (tsk_rt(first)->is_aux_task < tsk_rt(second)->is_aux_task) {
@@ -247,6 +260,7 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                                 }
                                 else if (tsk_rt(first)->is_aux_task == tsk_rt(second)->is_aux_task) {
 #endif
+#endif
 
                                 /* Something could be wrong if you get this far. */
                                 if (unlikely(first->rt_param.inh_task ==
@@ -283,10 +297,12 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                                                 return 1;
                                         }
                                 }
-
+#if 0
 #ifdef CONFIG_REALTIME_AUX_TASKS
                                 }
 #endif
+#endif
+
 #ifdef CONFIG_LITMUS_SOFTIRQD
                                 }
 #endif