C-EDF: do not requeue jobs without budget

This patch replicates the fix in commit
f141d730e91283a9bb5cfcb134fcead55d5da0c6
(which applies to GSN-EDF).

1 files changed, 4 insertions, 4 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index caf7c52d2b84..b0c16e34d2c5 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -305,11 +305,11 @@ static void check_for_preemptions(cedf_domain_t *cluster)
                                                 &per_cpu(cedf_cpu_entries, task_cpu(task)));
                         if(affinity)
                                 last = affinity;
-                        else if(last->linked)
+                        else if(requeue_preempted_job(last->linked))
                                 requeue(last->linked);
                 }
 #else
-                if (last->linked)
+                if (requeue_preempted_job(last->linked))
                         requeue(last->linked);
 #endif
                 link_task_to_cpu(task, last);
@@ -479,9 +479,9 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
         /* Any task that is preemptable and either exhausts its execution
          * budget or wants to sleep completes. We may have to reschedule after
          * this. Don't do a job completion if we block (can't have timers running
-         * for blocked jobs). Preemption go first for the same reason.
+         * for blocked jobs).
          */
-        if (!np && (out_of_time || sleep) && !blocks && !preempt)
+        if (!np && (out_of_time || sleep) && !blocks)
                 job_completion(entry->scheduled, !sleep);
 
         /* Link pending task if we became unlinked.