1 files changed, 8 insertions, 3 deletions

diff --git a/litmus/sched_pfair.c b/litmus/sched_pfair.c
index c5ec177f236b..4f9a8c2ecdc3 100644
--- a/litmus/sched_pfair.c
+++ b/litmus/sched_pfair.c
@@ -630,9 +630,14 @@ static void process_out_of_budget_tasks(
                 list_del(&tsk_rt(t)->list);
                 if (t != prev || !blocks)
                 {
-                        sched_trace_task_release(t);
-                        add_release(&cpu_cluster(state)->pfair, t);
-                        TRACE_TASK(t, "adding to release queue (budget exhausted)\n");
+                        if (time_after(cur_release(t), state->local_tick)) {
+                                TRACE_TASK(t, "adding to release queue (budget exhausted)\n");
+                                add_release(&cpu_cluster(state)->pfair, t);
+                        } else {
+                                TRACE_TASK(t, "adding to ready queue (budget exhausted)\n");
+                                sched_trace_task_release(t);
+                                __add_ready(&cpu_cluster(state)->pfair, t);
+                        }
                 } else {
                         TRACE_TASK(t, "not added to release queue (blocks=%d)\n", blocks);
                         tsk_pfair(t)->needs_requeue = 1;