1 files changed, 12 insertions, 2 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index e9422077f9dd..00dabbf65af7 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -779,7 +779,7 @@ static enum hrtimer_restart cedf_simple_io_on_exhausted(struct task_struct *t, i
                 else {
                         lt_t remaining;
                         cedf_domain_t *cluster;
-                        unsigned long flags;
+                        unsigned long flags, kludge_flags;
 
                         BUG_ON(in_schedule);
 
@@ -792,6 +792,8 @@ static enum hrtimer_restart cedf_simple_io_on_exhausted(struct task_struct *t, i
                         /* force job completion */
                         TRACE_TASK(t, "blocked, postponing deadline\n");
 
+                        local_irq_save(kludge_flags);
+                        
                         /* Outermost lock of the cluster. Recursive lock calls are
                          * possible on this code path. This should be the _ONLY_
                          * scenario where recursive calls are made. */
@@ -866,6 +868,8 @@ static enum hrtimer_restart cedf_simple_io_on_exhausted(struct task_struct *t, i
 #else
                         raw_readyq_unlock_irqrestore(&cluster->cluster_lock, flags);
 #endif
+                        flush_pending_wakes();
+                        local_irq_restore(kludge_flags);
 
                         /* we need to set up the budget timer since we're within the callback. */
                         hrtimer_forward_now(&get_budget_timer(t).timer.timer,
@@ -971,7 +975,7 @@ static enum hrtimer_restart cedf_sobliv_on_exhausted(struct task_struct *t, int
                 else {
                         lt_t remaining;
                         cedf_domain_t *cluster;
-                        unsigned long flags;
+                        unsigned long flags, kludge_flags;
 
                         BUG_ON(in_schedule);
 
@@ -984,6 +988,8 @@ static enum hrtimer_restart cedf_sobliv_on_exhausted(struct task_struct *t, int
                         /* force job completion */
                         TRACE_TASK(t, "blocked, postponing deadline\n");
 
+                        local_irq_save(kludge_flags);
+                        
                         /* Outermost lock of the cluster. Recursive lock calls are
                          * possible on this code path. This should be the _ONLY_
                          * scenario where recursive calls are made. */
@@ -1061,6 +1067,8 @@ static enum hrtimer_restart cedf_sobliv_on_exhausted(struct task_struct *t, int
 #else
                         raw_readyq_unlock_irqrestore(&cluster->cluster_lock, flags);
 #endif
+                        flush_pending_wakes();
+                        local_irq_restore(kludge_flags);
 
                         /* we need to set up the budget timer since we're within the callback. */
                         if (bt_flag_is_set(t, BTF_IS_TOP_M)) {
@@ -2816,6 +2824,8 @@ static long cedf_activate_plugin(void)
 #ifdef CONFIG_LITMUS_NVIDIA
         init_nvidia_info();
 #endif
+        
+        init_wake_queues();
 
         free_cpumask_var(mask);
         clusters_allocated = 1;