2 files changed, 22 insertions, 38 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 62d28d2bf1c8..b45b46fc4fca 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -595,25 +595,17 @@ static void cedf_task_wake_up(struct task_struct *task)
         cluster = task_cpu_cluster(task);
 
         raw_spin_lock_irqsave(&cluster->cluster_lock, flags);
-        /* We need to take suspensions because of semaphores into
-         * account! If a job resumes after being suspended due to acquiring
-         * a semaphore, it should never be treated as a new job release.
-         */
-        if (get_rt_flags(task) == RT_F_EXIT_SEM) {
-                tsk_rt(task)->completed = 0;
-        } else {
-                now = litmus_clock();
-                if (is_tardy(task, now)) {
-                        /* new sporadic release */
-                        release_at(task, now);
-                        sched_trace_task_release(task);
-                }
-                else {
-                        if (task->rt.time_slice) {
-                                /* came back in time before deadline
-                                */
-                                tsk_rt(task)->completed = 0;
-                        }
+        now = litmus_clock();
+        if (is_tardy(task, now)) {
+                /* new sporadic release */
+                release_at(task, now);
+                sched_trace_task_release(task);
+        }
+        else {
+                if (task->rt.time_slice) {
+                        /* came back in time before deadline
+                        */
+                        tsk_rt(task)->completed = 0;
                 }
         }
         cedf_job_arrival(task);
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 990e4e1f86a9..b8548b885b35 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -577,25 +577,17 @@ static void gsnedf_task_wake_up(struct task_struct *task)
         TRACE_TASK(task, "wake_up at %llu\n", litmus_clock());
 
         raw_spin_lock_irqsave(&gsnedf_lock, flags);
-        /* We need to take suspensions because of semaphores into
-         * account! If a job resumes after being suspended due to acquiring
-         * a semaphore, it should never be treated as a new job release.
-         */
-        if (get_rt_flags(task) == RT_F_EXIT_SEM) {
-                tsk_rt(task)->completed = 0;
-        } else {
-                now = litmus_clock();
-                if (is_tardy(task, now)) {
-                        /* new sporadic release */
-                        release_at(task, now);
-                        sched_trace_task_release(task);
-                }
-                else {
-                        if (task->rt.time_slice) {
-                                /* came back in time before deadline
-                                */
-                                tsk_rt(task)->completed = 0;
-                        }
+        now = litmus_clock();
+        if (is_tardy(task, now)) {
+                /* new sporadic release */
+                release_at(task, now);
+                sched_trace_task_release(task);
+        }
+        else {
+                if (task->rt.time_slice) {
+                        /* came back in time before deadline
+                        */
+                        tsk_rt(task)->completed = 0;
                 }
         }
         gsnedf_job_arrival(task);