Merge branch 'wip-gpu-cleanup' into wip-2012.3-gpu

Conflicts:
	include/litmus/fpmath.h
	include/litmus/litmus.h
	include/litmus/rt_param.h
	include/litmus/trace.h
	kernel/sched.c
	kernel/softirq.c
	litmus/edf_common.c
	litmus/jobs.c
	litmus/litmus.c
	litmus/locking.c
	litmus/preempt.c
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c
	litmus/sched_litmus.c
	litmus/sync.c

1 files changed, 9 insertions, 4 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 1683d3847560..54322e278a1e 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -300,10 +300,15 @@ 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, %llu) rel=%llu "
-                "to ready queue at %llu\n",
-                new->comm, new->pid,
-                get_exec_cost(new), get_rt_period(new), get_rt_relative_deadline(new),
+        TRACE("rt: adding %s/%d (%llu, %llu, %llu) "
+                "[inh_task: %s/%d (%llu, %llu %llu)] "
+                "rel=%llu to ready queue at %llu\n",
+                new->comm, new->pid, get_exec_cost(new), get_rt_period(new), get_rt_relative_deadline(new),
+                (tsk_rt(new)->inh_task) ? tsk_rt(new)->inh_task->comm : "(nil)",
+                (tsk_rt(new)->inh_task) ? tsk_rt(new)->inh_task->pid : 0,
+                (tsk_rt(new)->inh_task) ? get_exec_cost(tsk_rt(new)->inh_task) : 0,
+                (tsk_rt(new)->inh_task) ? get_rt_period(tsk_rt(new)->inh_task) : 0,
+                (tsk_rt(new)->inh_task) ? get_rt_relative_deadline(tsk_rt(new)->inh_task) : 0,
                 get_release(new), litmus_clock());
 
         BUG_ON(bheap_node_in_heap(tsk_rt(new)->heap_node));