1 files changed, 39 insertions, 3 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 2246e9b8754e..61d682d9f415 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -52,6 +52,7 @@
 
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
 #include <litmus/fifo_lock.h>
+#include <litmus/prioq_lock.h>
 #include <litmus/ikglp_lock.h>
 #endif
 
@@ -852,6 +853,7 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
                 TRACE_TASK(prev, "will be preempted by %s/%d\n",
                            entry->linked->comm, entry->linked->pid);
 
+#ifdef CONFIG_REALTIME_AUX_TASKS
         if (tsk_rt(prev)->is_aux_task &&
                 (prev->state == TASK_INTERRUPTIBLE) &&
                 !blocks) {
@@ -860,6 +862,7 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
                 next = prev; /* allow prev to continue. */
                 goto out_set_state;
         }
+#endif
 
         /* Send the signal that the budget has been exhausted */
         if (signal_budget)
@@ -931,7 +934,9 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
                 }
         }
 
+#ifdef CONFIG_REALTIME_AUX_TASKS
 out_set_state:
+#endif
 
         sched_state_task_picked();
         raw_spin_unlock(&cluster->cluster_lock);
@@ -1546,6 +1551,32 @@ static struct litmus_lock* cedf_new_fifo_mutex(void)
         return fifo_mutex_new(&cedf_fifo_mutex_lock_ops);
 }
 
+/* ******************** PRIOQ MUTEX ********************** */
+
+static struct litmus_lock_ops cedf_prioq_mutex_lock_ops = {
+        .lock   = prioq_mutex_lock,
+        .unlock = prioq_mutex_unlock,
+        .close  = prioq_mutex_close,
+        .deallocate = prioq_mutex_free,
+        
+        .propagate_increase_inheritance = prioq_mutex_propagate_increase_inheritance,
+        .propagate_decrease_inheritance = prioq_mutex_propagate_decrease_inheritance,
+        
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+        .dgl_lock = prioq_mutex_dgl_lock,
+        .is_owner = prioq_mutex_is_owner,
+        .enable_priority = prioq_mutex_enable_priority,
+        
+        .dgl_can_quick_lock = prioq_mutex_dgl_can_quick_lock,
+        .dgl_quick_lock = prioq_mutex_dgl_quick_lock,
+#endif
+};
+
+static struct litmus_lock* cedf_new_prioq_mutex(void)
+{
+        return prioq_mutex_new(&cedf_prioq_mutex_lock_ops);
+}
+
 /* ******************** IKGLP ********************** */
 
 static struct litmus_lock_ops cedf_ikglp_lock_ops = {
@@ -1603,6 +1634,10 @@ static long cedf_allocate_lock(struct litmus_lock **lock, int type,
                         *lock = cedf_new_fifo_mutex();
                         break;
 
+                case PRIOQ_MUTEX:
+                        *lock = cedf_new_prioq_mutex();
+                        break;
+                        
                 case IKGLP_SEM:
                         *lock = cedf_new_ikglp(args);
                         break;
@@ -1629,13 +1664,13 @@ UNSUPPORTED_LOCK:
 
 
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
-static struct affinity_observer_ops cedf_kfmlp_affinity_ops = {
+static struct affinity_observer_ops cedf_kfmlp_affinity_ops __attribute__ ((unused)) = {
         .close = kfmlp_aff_obs_close,
         .deallocate = kfmlp_aff_obs_free,
 };
 
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
-static struct affinity_observer_ops cedf_ikglp_affinity_ops = {
+static struct affinity_observer_ops cedf_ikglp_affinity_ops __attribute__ ((unused)) = {
         .close = ikglp_aff_obs_close,
         .deallocate = ikglp_aff_obs_free,
 };
@@ -1648,7 +1683,7 @@ static long cedf_allocate_affinity_observer(struct affinity_observer **aff_obs,
         int err;
 
         switch (type) {
-
+#ifdef CONFIG_LITMUS_NVIDIA
                 case KFMLP_SIMPLE_GPU_AFF_OBS:
                         *aff_obs = kfmlp_simple_gpu_aff_obs_new(&cedf_kfmlp_affinity_ops, args);
                         break;
@@ -1666,6 +1701,7 @@ static long cedf_allocate_affinity_observer(struct affinity_observer **aff_obs,
                         *aff_obs = ikglp_gpu_aff_obs_new(&cedf_ikglp_affinity_ops, args);
                         break;
 #endif
+#endif
                 default:
                         err = -ENXIO;
                         goto UNSUPPORTED_AFF_OBS;