4 files changed, 20 insertions, 7 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index de751a14d77c..c4c74fe299fc 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -19,6 +19,8 @@
 
 #include <litmus/trace.h>
 
+#include <trace/events/sched.h>
+
 #include <litmus/rt_domain.h>
 
 /* Number of RT tasks that exist in the system */
@@ -342,7 +344,8 @@ long litmus_admit_task(struct task_struct* tsk)
 
         if (!retval) {
                 sched_trace_task_name(tsk);
-                sched_trace_task_param(tsk);
+//              sched_trace_task_param(tsk);
+                trace_litmus_task_param(tsk);
                 atomic_inc(&rt_task_count);
         }
 
@@ -355,7 +358,8 @@ out:
 void litmus_exit_task(struct task_struct* tsk)
 {
         if (is_realtime(tsk)) {
-                sched_trace_task_completion(tsk, 1);
+//              sched_trace_task_completion(tsk, 1);
+                trace_litmus_task_completion(tsk, 1);
 
                 litmus->task_exit(tsk);
 
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 62c9fdcd22be..d5ece53fa61e 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -19,6 +19,8 @@
 
 #include <litmus/trace.h>
 
+#include <trace/events/sched.h>
+
 #include <litmus/heap.h>
 
 static int dummy_resched(rt_domain_t *rt)
@@ -181,7 +183,8 @@ static void arm_release_timer(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);
+//              sched_trace_task_release(t);
+                trace_litmus_task_release(t);
                 list_del(pos);
 
                 /* put into release heap while holding release_lock */
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index a223e69f2efb..5386f0a24587 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -18,6 +18,8 @@
 #include <litmus/edf_common.h>
 #include <litmus/sched_trace.h>
 
+#include <trace/events/sched.h>
+
 #include <litmus/heap.h>
 
 #include <linux/module.h>
@@ -321,7 +323,8 @@ static noinline void job_completion(struct task_struct *t, int forced)
 {
         BUG_ON(!t);
 
-        sched_trace_task_completion(t, forced);
+//      sched_trace_task_completion(t, forced);
+        trace_litmus_task_completion(t, forced);
 
         TRACE_TASK(t, "job_completion().\n");
 
@@ -330,7 +333,8 @@ static noinline void job_completion(struct task_struct *t, int forced)
         /* prepare for next period */
         prepare_for_next_period(t);
         if (is_released(t, litmus_clock()))
-                sched_trace_task_release(t);
+                trace_litmus_task_release(t);
+//              sched_trace_task_release(t);
         /* unlink */
         unlink(t);
         /* requeue
@@ -558,7 +562,8 @@ static void gsnedf_task_wake_up(struct task_struct *task)
                 if (is_tardy(task, now)) {
                         /* new sporadic release */
                         release_at(task, now);
-                        sched_trace_task_release(task);
+//                      sched_trace_task_release(task);
+                        trace_litmus_task_release(task);
                 }
                 else {
                         if (task->rt.time_slice) {
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 4d1cdacbeb9f..2aa609466cde 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -145,7 +145,8 @@ static void enqueue_task_litmus(struct rq *rq, struct task_struct *p,
                                 int wakeup)
 {
         if (wakeup) {
-                sched_trace_task_resume(p);
+//              sched_trace_task_resume(p);
+                trace_litmus_task_resume(p);
                 tsk_rt(p)->present = 1;
                 litmus->task_wake_up(p);
         } else