C-EDF/GSN-EDF: fix non-preemptive section support

Don't unlink. The job was put into the ready queue
when it was previously unlinked. If we remove it
from the ready queue, then it won't ever be scheduled
again.

2 files changed, 4 insertions, 8 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 1950783c0388..295456bc3411 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -427,12 +427,10 @@ static struct task_struct* cedf_schedule(struct task_struct * prev)
                 unlink(entry->scheduled);
 
         /* Request a sys_exit_np() call if we would like to preempt but cannot.
-         * We need to make sure to update the link structure anyway in case
-         * that we are still linked. Multiple calls to request_exit_np() don't
-         * hurt.
+         * Do not unlink since entry->scheduled is currently in the ready queue.
+         * We don't process out_of_time and sleep until the job is preemptive again.
          */
         if (np && (out_of_time || preempt || sleep)) {
-                unlink(entry->scheduled);
                 request_exit_np(entry->scheduled);
         }
 
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 26014437cc3e..dffea128739f 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -420,12 +420,10 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
                 unlink(entry->scheduled);
 
         /* Request a sys_exit_np() call if we would like to preempt but cannot.
-         * We need to make sure to update the link structure anyway in case
-         * that we are still linked. Multiple calls to request_exit_np() don't
-         * hurt.
+         * Do not unlink since entry->scheduled is currently in the ready queue.
+         * We don't process out_of_time and sleep until the job is preemptive again.
          */
         if (np && (out_of_time || preempt || sleep)) {
-                unlink(entry->scheduled);
                 request_exit_np(entry->scheduled);
         }