3 files changed, 22 insertions, 2 deletions

diff --git a/litmus/budget.c b/litmus/budget.c
index 310e9a3d4172..75f4b5156947 100644
--- a/litmus/budget.c
+++ b/litmus/budget.c
@@ -4,6 +4,7 @@
 
 #include <litmus/litmus.h>
 #include <litmus/preempt.h>
+#include <litmus/budget.h>
 
 struct enforcement_timer {
         /* The enforcement timer is used to accurately police
@@ -108,4 +109,21 @@ static int __init init_budget_enforcement(void)
         return 0;
 }
 
+void prepare_for_next_server(struct task_struct *t, int forced)
+{
+        if (!job_behind(t)) {
+                t->rt_param.job_params.release   = t->rt_param.job_params.deadline;
+                t->rt_param.job_params.deadline += get_rt_period(t);
+                t->rt_param.job_params.exec_time = 0;
+                /* update job sequence number */
+                t->rt_param.job_params.job_no++;
+        } else if (forced) {
+                t->rt_param.job_params.release = t->rt_param.job_params.deadline;
+                t->rt_param.job_params.exec_time = 0;
+        } else /* behind */{
+                t->rt_param.job_params.deadline += get_rt_period(t);
+                t->rt_param.job_params.job_no++;
+        }
+}
+
 module_init(init_budget_enforcement);
diff --git a/litmus/jobs.c b/litmus/jobs.c
index 36e314625d86..669a3df5fcc1 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -10,6 +10,7 @@ void prepare_for_next_period(struct task_struct *t)
 {
         BUG_ON(!t);
         /* prepare next release */
+
         t->rt_param.job_params.release   = t->rt_param.job_params.deadline;
         t->rt_param.job_params.deadline += get_rt_period(t);
         t->rt_param.job_params.exec_time = 0;
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 8828919dfcf2..ddd5933da4f8 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -24,6 +24,7 @@
 #include <litmus/domain.h>
 #include <litmus/bheap.h>
 #include <litmus/event_group.h>
+#include <litmus/budget.h>
 
 #include <litmus/sched_mc.h>
 #include <litmus/ce_domain.h>
@@ -595,7 +596,7 @@ static void job_completion(struct task_struct *task, int forced)
         now = litmus_clock();
 
         /* If it's not a ghost job, do ghost job conversion */
-        if (!is_ghost(task)) {
+        if (!is_ghost(task) && !job_behind(task)) {
                 TRACE_MC_TASK(task, "is not a ghost task\n");
                 tsk_mc_data(task)->mc_job.ghost_budget = budget_remaining(task);
                 tsk_mc_data(task)->mc_job.is_ghost = 1;
@@ -608,7 +609,7 @@ static void job_completion(struct task_struct *task, int forced)
         if (tsk_mc_data(task)->mc_job.ghost_budget == 0) {
                 TRACE_MC_TASK(task, "has zero ghost budget\n");
                 tsk_mc_data(task)->mc_job.is_ghost = 0;
-                prepare_for_next_period(task);
+                prepare_for_next_server(task, forced);
                 if (is_released(task, litmus_clock()))
                         sched_trace_task_release(task);
         }