1 files changed, 17 insertions, 16 deletions

diff --git a/litmus/sched_color.c b/litmus/sched_color.c
index 44327d60aaa5..66ce40fd1b57 100644
--- a/litmus/sched_color.c
+++ b/litmus/sched_color.c
@@ -278,21 +278,7 @@ static void check_for_fifo_preempt(void)
  */
 static void job_arrival(struct task_struct *t)
 {
-        int i;
         rt_domain_t *dom = task_dom(task_entry(t), t);
-        struct dgl_group_req *gr = tsk_rt(t)->req;
-        struct control_page  *cp = tsk_rt(t)->ctrl_page;
-        struct color_ctrl_page *ccp = tsk_rt(t)->color_ctrl_page;
-
-        /* Fill request */
-        if (cp && ccp && cp->colors_updated) {
-                cp->colors_updated = 0;
-                dgl_group_req_init(&group_lock, gr);
-                for (i = 0; ccp->pages[i]; ++i)
-                        set_req(&group_lock, gr, ccp->colors[i], ccp->pages[i]);
-        } else {
-                TRACE("Oh noz: %p %p %d\n", cp, ccp, ((cp) ? cp->colors_updated : -1));
-        }
 
         lock_if(&fifo_lock, is_be(t));
         requeue(dom, t);
@@ -519,12 +505,12 @@ static struct task_struct* color_schedule(struct task_struct *prev)
                 acquire_resources(next);
                 if (has_resources(next, entry->server.cpu)) {
                         TRACE_TASK(next, "Has group lock\n");
-                        sched_trace_task_resume(next, 1);
+                        sched_trace_task_resume_on(next, 1);
                 } else {
                         TRACE_TASK(next, "Does not have lock, 0x%p does\n",
                                    group_lock.acquired[entry->server.cpu]);
                         if (next != prev)
-                                sched_trace_task_block(next, 1);
+                                sched_trace_task_block_on(next, 1);
                         next = NULL;
                         server_running = 0;
                 }
@@ -562,9 +548,13 @@ static struct task_struct* color_schedule(struct task_struct *prev)
 
 static void color_task_new(struct task_struct *t, int on_rq, int running)
 {
+        int i;
         unsigned long flags;
         struct cpu_entry *entry;
         struct dgl_group_req *req;
+        struct control_page  *cp = tsk_rt(t)->ctrl_page;
+        struct color_ctrl_page *ccp = tsk_rt(t)->color_ctrl_page;
+
 
         TRACE_TASK(t, "New colored task\n");
         entry = (is_be(t)) ? local_entry : task_entry(t);
@@ -583,6 +573,17 @@ static void color_task_new(struct task_struct *t, int on_rq, int running)
 
         release_at(t, litmus_clock());
 
+        /* Fill request */
+        if (cp && ccp && cp->colors_updated) {
+                TRACE_TASK(t, "Initializing group request\n");
+                cp->colors_updated = 0;
+                dgl_group_req_init(&group_lock, req);
+                for (i = 0; ccp->pages[i]; ++i)
+                        set_req(&group_lock, req, ccp->colors[i], ccp->pages[i]);
+        } else {
+                TRACE("Oh noz: %p %p %d\n", cp, ccp, ((cp) ? cp->colors_updated : -1));
+        }
+
         if (running) {
                 /* No need to lock with irqs disabled */
                 TRACE_TASK(t, "Already scheduled on %d\n", entry->server.cpu);