1 files changed, 5 insertions, 1 deletions

diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index a08373e28469..40c1ce412891 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -260,6 +260,9 @@ static void gedf_task_replenish_budget(
                 res->priority = ULLONG_MAX - res->replenishment_time - get_rt_relative_deadline(t);
                 TRACE_TASK(t, "overrun budget!\n");
         }
+        //TODO: hacky. reset exec_time so arm_enforcement_timer doesn't
+        // yell at us for trying to set timer while overrun budget
+        tsk_rt(t)->job_params.exec_time = 0;
         res->budget_consumed = 0;
         res->cur_budget = get_exec_cost(t);
 }
@@ -287,7 +290,8 @@ static void gedf_task_drain_budget(
 {
         struct task_struct* t = ((struct gedf_task_reservation*)res)->task;
 
-        if (how_much > res->cur_budget || is_completed(t))
+        if (how_much > res->cur_budget || is_completed(t) ||
+                (budget_enforced(t) && budget_exhausted(t)))
                 res->cur_budget = 0;
         else
                 res->cur_budget -= how_much;