1 files changed, 12 insertions, 6 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
index 36e314625d86..bc8246572e54 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -6,13 +6,13 @@
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 
-void prepare_for_next_period(struct task_struct *t)
+static inline void setup_release(struct task_struct *t, lt_t release)
 {
-        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.release = release;
+        t->rt_param.job_params.deadline = release + get_rt_relative_deadline(t);
         t->rt_param.job_params.exec_time = 0;
+
         /* update job sequence number */
         t->rt_param.job_params.job_no++;
 
@@ -20,10 +20,16 @@ void prepare_for_next_period(struct task_struct *t)
         t->rt.time_slice = 1;
 }
 
+void prepare_for_next_period(struct task_struct *t)
+{
+        BUG_ON(!t);
+        setup_release(t, get_release(t) + get_rt_period(t));
+}
+
 void release_at(struct task_struct *t, lt_t start)
 {
-        t->rt_param.job_params.deadline = start;
-        prepare_for_next_period(t);
+        BUG_ON(!t);
+        setup_release(t, start);
         set_rt_flags(t, RT_F_RUNNING);
 }