Merged with ce domains

1 files changed, 8 insertions, 8 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 50a6abfd767..db92e849f08 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -104,8 +104,8 @@ void release_heap_free(struct release_heap* rh)
 {
         /* make sure timer is no longer in use */
 #ifdef CONFIG_MERGE_TIMERS
-        if (rh->dom)
-                cancel_event(&rh->event);
+        /* if (rh->dom) */
+        /*      cancel_event(&rh->event); */
 #else
         hrtimer_cancel(&rh->timer);
 #endif
@@ -166,7 +166,7 @@ static void reinit_release_heap(rt_domain_t *rt, struct task_struct* t)
 
 #ifdef CONFIG_MERGE_TIMERS
         rh->event.prio = rt->prio;
-        cancel_event(&rh->event);
+        cancel_event(rt->event_group, &rh->event);
 #else
         /* Make sure it is safe to use.  The timer callback could still
          * be executing on another CPU; hrtimer_cancel() will wait
@@ -323,7 +323,7 @@ void rt_domain_init(rt_domain_t *rt,
  */
 void __add_ready(rt_domain_t* rt, struct task_struct *new)
 {
-        TRACE("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",
               new->comm, new->pid, get_exec_cost(new), get_rt_period(new),
               get_release(new), litmus_clock());
 
@@ -348,7 +348,7 @@ void __merge_ready(rt_domain_t* rt, struct bheap* tasks)
 void __add_release_on(rt_domain_t* rt, struct task_struct *task,
                       int target_cpu)
 {
-        TRACE_TASK(task, "add_release_on(), rel=%llu, target=%d\n",
+        VTRACE_TASK(task, "add_release_on(), rel=%llu, target=%d\n",
                    get_release(task), target_cpu);
         list_add(&tsk_rt(task)->list, &rt->tobe_released);
         task->rt_param.domain = rt;
@@ -367,7 +367,7 @@ void __add_release_on(rt_domain_t* rt, struct task_struct *task,
  */
 void __add_release(rt_domain_t* rt, struct task_struct *task)
 {
-        TRACE_TASK(task, "add_release(), rel=%llu\n", get_release(task));
+        VTRACE_TASK(task, "add_release(), rel=%llu\n", get_release(task));
         list_add(&tsk_rt(task)->list, &rt->tobe_released);
         task->rt_param.domain = rt;
 
@@ -398,12 +398,12 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
 
         if (is_released(task, litmus_clock())) {
                 __add_ready(domain, task);
-                TRACE("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 */
-                TRACE_TASK(task, "add release(), rel=%llu\n", get_release(task));
+                VTRACE_TASK(task, "add release(), rel=%llu\n", get_release(task));
                 add_release(domain, task);
         }
 }