1 files changed, 12 insertions, 6 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index 255e4f36e413..441fbfddf0c2 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -22,7 +22,7 @@
 #include <litmus/fpmath.h>
 #endif
 
-#if defined(CONFIG_EDF_TIE_BREAK_HASH)
+#ifdef CONFIG_EDF_TIE_BREAK_HASH
 #include <linux/hash.h>
 static inline long edf_hash(struct task_struct *t)
 {
@@ -134,7 +134,8 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                 }
 
                 if (first->rt_param.is_aux_task && second->rt_param.is_aux_task &&
-                        first->rt_param.inh_task == second->rt_param.inh_task) {  // inh_task is !NULL for both tasks since neither was a lo_aux task
+                        first->rt_param.inh_task == second->rt_param.inh_task) {
+                        // inh_task is !NULL for both tasks since neither was a lo_aux task.
                         // Both aux tasks inherit from the same task, so tie-break
                         // by base priority of the aux tasks.
                         TRACE_CUR("aux tie break!\n");
@@ -171,9 +172,10 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                 }
 
                 if (first->rt_param.is_interrupt_thread && second->rt_param.is_interrupt_thread &&
-                        first->rt_param.inh_task == second->rt_param.inh_task) {  // inh_task is !NULL for both tasks since neither was a lo_klmirqd task
-                                                                                                                                          // Both klmirqd tasks inherit from the same task, so tie-break
-                                                                                                                                          // by base priority of the klmirqd tasks.
+                        first->rt_param.inh_task == second->rt_param.inh_task) {
+                        // inh_task is !NULL for both tasks since neither was a lo_klmirqd task.
+                        // Both klmirqd tasks inherit from the same task, so tie-break
+                        // by base priority of the klmirqd tasks.
                         TRACE_CUR("klmirqd tie break!\n");
                         goto klmirqd_tie_break;
                 }
@@ -220,8 +222,12 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
 
 #endif
 
+#ifdef CONFIG_REALTIME_AUX_TASKS
 aux_tie_break:
+#endif
+#ifdef CONFIG_LITMUS_SOFTIRQD
 klmirqd_tie_break:
+#endif
 
         if (!is_realtime(second_task)) {
                 return 1;
@@ -236,7 +242,7 @@ klmirqd_tie_break:
                 int pid_break;
 
 #if defined(CONFIG_EDF_TIE_BREAK_LATENESS)
-        /* Tie break by lateness. Jobs with greater lateness get
+                /* Tie break by lateness. Jobs with greater lateness get
                  * priority. This should spread tardiness across all tasks,
                  * especially in task sets where all tasks have the same
                  * period and relative deadlines.