5 files changed, 2 insertions, 21 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
index 32685012503b..89a0810415fa 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -15,9 +15,6 @@ static inline void setup_release(struct task_struct *t, lt_t release)
 
         /* update job sequence number */
         t->rt_param.job_params.job_no++;
-
-        /* don't confuse Linux */
-        t->rt.time_slice = 1;
 }
 
 void prepare_for_next_period(struct task_struct *t)
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index c55743f3970d..458c6421cfce 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -601,13 +601,6 @@ static void cedf_task_wake_up(struct task_struct *task)
                 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);
         raw_spin_unlock_irqrestore(&cluster->cluster_lock, flags);
 }
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 27a89eeb11ac..5a63ef1c580f 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -583,13 +583,6 @@ static void gsnedf_task_wake_up(struct task_struct *task)
                 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);
         raw_spin_unlock_irqrestore(&gsnedf_lock, flags);
 }
diff --git a/litmus/sched_pfp.c b/litmus/sched_pfp.c
index 6113ae376bec..86c4c696c671 100644
--- a/litmus/sched_pfp.c
+++ b/litmus/sched_pfp.c
@@ -126,7 +126,7 @@ static void job_completion(struct task_struct* t, int forced)
         sched_trace_task_completion(t,forced);
         TRACE_TASK(t, "job_completion().\n");
 
-        tsk_rt(t)->completed = 1;
+        tsk_rt(t)->completed = 0;
         prepare_for_next_period(t);
         if (is_released(t, litmus_clock()))
                 sched_trace_task_release(t);
@@ -253,7 +253,6 @@ static struct task_struct* pfp_schedule(struct task_struct * prev)
 
         if (next) {
                 TRACE_TASK(next, "scheduled at %llu\n", litmus_clock());
-                tsk_rt(next)->completed = 0;
         } else {
                 TRACE("becoming idle at %llu\n", litmus_clock());
         }
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 4c3ee8f68bc1..e0657bb6db78 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -160,7 +160,7 @@ static void job_completion(struct task_struct* t, int forced)
         sched_trace_task_completion(t,forced);
         TRACE_TASK(t, "job_completion().\n");
 
-        tsk_rt(t)->completed = 1;
+        tsk_rt(t)->completed = 0;
         prepare_for_next_period(t);
 }
 
@@ -266,7 +266,6 @@ static struct task_struct* psnedf_schedule(struct task_struct * prev)
 
         if (next) {
                 TRACE_TASK(next, "scheduled at %llu\n", litmus_clock());
-                tsk_rt(next)->completed = 0;
         } else {
                 TRACE("becoming idle at %llu\n", litmus_clock());
         }