GSN-EDF: fix admission of suspended tasks

In the task_new() handler, don't process a job arrival event if the
task is actually suspended. This fixes the admission of suspended
tasks.

1 files changed, 4 insertions, 3 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 04454e8ce51e..27a89eeb11ac 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -531,7 +531,7 @@ static void gsnedf_finish_switch(struct task_struct *prev)
 
 /*      Prepare a task for running in RT mode
  */
-static void gsnedf_task_new(struct task_struct * t, int on_rq, int running)
+static void gsnedf_task_new(struct task_struct * t, int on_rq, int is_scheduled)
 {
         unsigned long           flags;
         cpu_entry_t*            entry;
@@ -543,7 +543,7 @@ static void gsnedf_task_new(struct task_struct * t, int on_rq, int running)
         /* setup job params */
         release_at(t, litmus_clock());
 
-        if (running) {
+        if (is_scheduled) {
                 entry = &per_cpu(gsnedf_cpu_entries, task_cpu(t));
                 BUG_ON(entry->scheduled);
 
@@ -564,7 +564,8 @@ static void gsnedf_task_new(struct task_struct * t, int on_rq, int running)
         }
         t->rt_param.linked_on          = NO_CPU;
 
-        gsnedf_job_arrival(t);
+        if (is_running(t))
+                gsnedf_job_arrival(t);
         raw_spin_unlock_irqrestore(&gsnedf_lock, flags);
 }