WIP snapshot

1 files changed, 18 insertions, 13 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 7fd6276b3418..4f5bb26b339b 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -740,7 +740,7 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
         struct task_struct* next = NULL;
 
 #ifdef CONFIG_LITMUS_LOCKING
-        int priodon, reeval;
+        int priodon;
 #else
 #define priodon 0
 #endif
@@ -823,20 +823,25 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
          */
 
         if (!entry->linked) {
-                struct task_struct *pulled = __take_ready(&cluster->domain);
 #ifdef CONFIG_LITMUS_LOCKING
-                if (pulled && !is_pending(pulled)) {
-                        /* Pulled an un-processed task from the ready queue.
-                         * Since this job was ready but not yet processed, it
-                         * cannot be a priority donor. So we should never
-                         * have to re-evaluate.
-                         */
-                        TRACE_TASK(pulled, "pulled unprocessed\n");
-                        reeval = update_pending_job(cluster, pulled);
-                        BUG_ON(reeval);
-                }
-#endif
+                struct task_struct *pulled;
+                int reeval;
+                do {
+                        pulled =  __take_ready(&cluster->domain);
+                        reeval = 0;
+                        if (pulled && !is_pending(pulled)) {
+                                /* Pulled an un-processed task from the ready queue. */
+                                TRACE_TASK(pulled, "pulled unprocessed\n");
+                                reeval = update_pending_job(cluster, pulled);
+                                if (reeval)
+                                        /* priority may have changed --- try again */
+                                        requeue(pulled);
+                        }
+                } while (reeval);
                 link_task_to_cpu(pulled, entry);
+#else
+                link_task_to_cpu(__take_ready(&cluster->domain), entry);
+#endif
         }
 
         /* The final scheduling decision. Do we need to switch for some reason?