1 files changed, 15 insertions, 2 deletions

diff --git a/litmus/sched_edf_wm.c b/litmus/sched_edf_wm.c
index 34f8421afdf5..f3627ad1174a 100644
--- a/litmus/sched_edf_wm.c
+++ b/litmus/sched_edf_wm.c
@@ -433,7 +433,20 @@ static void wm_release_at(struct task_struct *t, lt_t start)
                 release_at(t, start);
 }
 
-static void wm_task_wake_up(struct task_struct *t   )
+static lt_t wm_earliest_release(struct task_struct *t, lt_t now)
+{
+        lt_t deadline;
+        if (is_sliced_task(t))
+                deadline = tsk_rt(t)->semi_part.wm.job_deadline;
+        else
+                deadline = get_deadline(t);
+        if (lt_before(deadline, now))
+                return now;
+        else
+                return deadline;
+}
+
+static void wm_task_wake_up(struct task_struct *t)
 {
         unsigned long flags;
         wm_domain_t* dom = domain_of_task(t);
@@ -454,7 +467,7 @@ static void wm_task_wake_up(struct task_struct *t   )
         /* account sleep time as execution time */
         if (get_exec_time(t) + sleep_time >= get_exec_cost(t)) {
                 /* new sporadic release */
-                wm_release_at(t, now);
+                wm_release_at(t, wm_earliest_release(t, now));
                 sched_trace_task_release(t);
         } else if (is_sliced_task(t)) {
                 /* figure out which slice we should be executing on */