1 files changed, 6 insertions, 14 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index b615092ce9c9..3b3b49ed48ea 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -261,7 +261,6 @@ static void setup_release(rt_domain_t *_rt)
         list_for_each_safe(pos, safe, &list) {
                 /* pick task of work list */
                 t = list_entry(pos, struct task_struct, rt_param.list);
-                /* sched_trace_task_release(t); */
                 list_del_init(pos);
 
                 /* put into release heap while holding release_lock */
@@ -412,24 +411,19 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
 {
         rt_domain_t *domain = (rt_domain_t*)dom->data;
 
-        BUG_ON(!task || !is_realtime(task));
         TRACE_TASK(task, "Requeueing\n");
+        BUG_ON(!task || !is_realtime(task));
         BUG_ON(is_queued(task));
         BUG_ON(get_task_domain(task) != dom);
 
-        if (is_queued(task)) {
-                VTRACE_TASK(task, "Queued, skipping\n");
-                return;
-        }
-
         if (is_released(task, litmus_clock())) {
                 __add_ready(domain, task);
-                VTRACE("going, rt: adding %s/%d (%llu, %llu) rel=%llu to ready queue at %llu\n",
+                VTRACE("rt: adding %s/%d (%llu, %llu) rel=%llu to ready queue at %llu\n",
                       task->comm, task->pid, get_exec_cost(task), get_rt_period(task),
                       get_release(task), litmus_clock());
         } else {
                 /* task has to wait for next release */
-                VTRACE_TASK(task, "not going, add release(), rel=%llu\n", get_release(task));
+                VTRACE_TASK(task, "add release(), rel=%llu\n", get_release(task));
                 add_release(domain, task);
         }
 
@@ -441,9 +435,8 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
  */
 static struct task_struct* pd_take_ready(domain_t *dom)
 {
-        struct task_struct *t = __take_ready((rt_domain_t*)dom->data);
-        return t;
-}
+        return __take_ready((rt_domain_t*)dom->data);
+ }
 
 /* pd_peek_ready - returns the head of the rt_domain ready queue
  *
@@ -451,8 +444,7 @@ static struct task_struct* pd_take_ready(domain_t *dom)
  */
 static struct task_struct* pd_peek_ready(domain_t *dom)
 {
-        struct task_struct *t = __peek_ready((rt_domain_t*)dom->data);
-        return t;
+        return  __next_ready((rt_domain_t*)dom->data);
 }
 
 static void pd_remove(domain_t *dom, struct task_struct *task)