1 files changed, 7 insertions, 14 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index a9bf0c08e125..5a3f5b417f73 100644..100755
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -43,7 +43,7 @@ static inline long edf_hash(struct task_struct *t)
 }
 #endif
 
-#ifdef CONFIG_REALTIME_AUX_TASKS
+#ifdef CONFIG_REALTIME_AUX_TASK_PRIORITY_INHERITANCE
 int aux_tie_break(struct task_struct *first, struct task_struct *second)
 {
         long fhash = edf_hash(first);
@@ -90,9 +90,8 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                 return first && !second;
         }
 
-#ifdef CONFIG_REALTIME_AUX_TASKS
-        {
 
+#if defined(CONFIG_REALTIME_AUX_TASK_PRIORITY_BOOSTED)
         /* run aux tasks at max priority */
         if (first->rt_param.is_aux_task != second->rt_param.is_aux_task)
         {
@@ -103,9 +102,8 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                 first = first->group_leader;
                 second = second->group_leader;
         }
-
-
-#if 0
+#elif defined(CONFIG_REALTIME_AUX_TASK_PRIORITY_INHERITANCE)
+        {
         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;
@@ -133,11 +131,10 @@ 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
 
+
 #ifdef CONFIG_LITMUS_LOCKING
         /* Check for EFFECTIVE priorities. Change task
          * used for comparison in such a case.
@@ -252,15 +249,13 @@ 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
+#if defined(CONFIG_REALTIME_AUX_TASK_PRIORITY_INHERITANCE)
                                 /* is this dead code? */
                                 if (tsk_rt(first)->is_aux_task < tsk_rt(second)->is_aux_task) {
                                         return 1;
                                 }
                                 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 ==
@@ -297,11 +292,9 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                                                 return 1;
                                         }
                                 }
-#if 0
-#ifdef CONFIG_REALTIME_AUX_TASKS
+#if defined(CONFIG_REALTIME_AUX_TASK_PRIORITY_INHERITANCE)
                                 }
 #endif
-#endif
 
 #ifdef CONFIG_LITMUS_SOFTIRQD
                                 }