Fix sleeping behavior.

A dublication of prepare_task_for_next_period() caused GSN-EDF to wrongly
calculate the next deadline of new jobs. This was fixed for the RTAS
experiments.

1 files changed, 2 insertions, 32 deletions

diff --git a/kernel/sched_gsn_edf.c b/kernel/sched_gsn_edf.c
index 293dd5d532..5ff2670727 100644
--- a/kernel/sched_gsn_edf.c
+++ b/kernel/sched_gsn_edf.c
@@ -393,7 +393,7 @@ static noinline void job_completion(struct task_struct *t)
         /* unlink */
         unlink(t);
         /* requeue
-         * But on't requeue a blocking task. */
+         * But don't requeue a blocking task. */
         if (is_running(t))
                 gsnedf_job_arrival(t);
 }
@@ -729,36 +729,6 @@ static long gsnedf_return_priority(struct pi_semaphore *sem)
         return ret;
 }
 
-/*
- *      Deactivate current task until the beginning of the next period.
- */
-static  long gsnedf_sleep_next_period(void)
-{
-        unsigned long flags;
-        struct task_struct* t = current;
-
-        queue_lock_irqsave(&gsnedf_lock, flags);
-
-        /* Mark that we do not excute anymore */
-        set_rt_flags(t, RT_F_SLEEP);
-        sched_trace_job_completion(t);
-        /* prepare for next period */
-        edf_prepare_for_next_period(t); 
-
-        /* unlink */
-        unlink(t);
-        /* requeue */
-        gsnedf_job_arrival(t);
-
-        /* will reschedule on return to user mode */
-        set_tsk_need_resched(t);
-
-        queue_unlock_irqrestore(&gsnedf_lock, flags);
-
-        return 0;
-}
-
-
 static int gsnedf_mode_change(int new_mode)
 {
         unsigned long flags;
@@ -806,7 +776,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
         .algo_scheduler_tick    = gsnedf_scheduler_tick,        \
         .scheduler_tick         = rt_scheduler_tick,            \
         .prepare_task           = gsnedf_prepare_task,          \
-        .sleep_next_period      = gsnedf_sleep_next_period,     \
+        .sleep_next_period      = edf_sleep_next_period,        \
         .tear_down              = gsnedf_tear_down,             \
         .schedule               = gsnedf_schedule,              \
         .finish_switch          = gsnedf_finish_switch,         \