Merged changes from Tegra branch.

1 files changed, 41 insertions, 38 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index cb8758f8aebf..0580340d0170 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -51,6 +51,7 @@ struct st_switch_away_data {	/* A process was switched away from on a given CPU.
         u64     exec_time;
 };
 
+/* changed: like everything */
 struct st_completion_data {     /* A job completed. */
         u32     exec;
         u16     flush_work;
@@ -76,8 +77,8 @@ struct st_resume_data {		/* A task resumes. */
 
 struct st_action_data {
         u64     when;
-        u32     action;
-        u8      __unused[4];
+        u8      action;
+        u8      __unused[7];
 };
 
 struct st_sys_release_data {
@@ -85,11 +86,13 @@ struct st_sys_release_data {
         u64     release;
 };
 
+/* changed: easy enough to remove */
 struct st_task_exit_data {
         u64     avg_exec_time;
         u64     max_exec_time;
 };
 
+/* changed: calculate yoself */
 struct st_task_tardy_data {
         u64     total_tardy;
         u32     max_tardy;
@@ -232,26 +235,26 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                 trace_litmus_task_param(t);                             \
         } while (0)
 
-#define sched_trace_task_release(t)/*                                   \ */
-        /* do {                                                         \ */
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 3,                    \ */
-        /*                      do_sched_trace_task_release, t);        \ */
-        /*      trace_litmus_task_release(t);                           \ */
-        /* } while (0) */
-
-#define sched_trace_task_switch_to(t)/*                                         \ */
-        /* do {                                                         \ */
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 4,                    \ */
-        /*              do_sched_trace_task_switch_to, t);              \ */
-        /*      trace_litmus_switch_to(t);                              \ */
-        /* } while (0) */
-
-#define sched_trace_task_switch_away(t)/*                                       \ */
-        /* do {                                                         \ */
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 5,                    \ */
-        /*              do_sched_trace_task_switch_away, t);            \ */
-        /*      trace_litmus_switch_away(t);                            \ */
-        /* } while (0) */
+#define sched_trace_task_release(t)                                     \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 3,                    \
+                                do_sched_trace_task_release, t);        \
+                trace_litmus_task_release(t);                           \
+        } while (0)
+
+#define sched_trace_task_switch_to(t)                                   \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 4,                    \
+                        do_sched_trace_task_switch_to, t);              \
+                trace_litmus_switch_to(t);                              \
+        } while (0)
+
+#define sched_trace_task_switch_away(t)                                 \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 5,                    \
+                        do_sched_trace_task_switch_away, t);            \
+                trace_litmus_switch_away(t);                            \
+        } while (0)
 
 #define sched_trace_task_completion(t, forced)                          \
         do {                                                            \
@@ -261,30 +264,30 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                 trace_litmus_task_completion(t, forced);                \
         } while (0)
 
-#define sched_trace_task_block_on(t, i)/*                                       \ */
-        /* do {                                                         \ */
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 7,                    \ */
-        /*              do_sched_trace_task_block, t);                  \ */
-        /*      trace_litmus_task_block(t, i);                          \ */
-        /* } while (0) */
+#define sched_trace_task_block_on(t, i)                                 \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 7,                    \
+                        do_sched_trace_task_block, t);                  \
+                trace_litmus_task_block(t, i);                          \
+        } while (0)
 
 #define sched_trace_task_block(t)                                       \
         sched_trace_task_block_on(t, 0)
 
-#define sched_trace_task_resume_on(t, i)/*                              \ */
-        /* do {                                                         \ */
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 8,                    \ */
-        /*                      do_sched_trace_task_resume, t);         \ */
-        /*      trace_litmus_task_resume(t, i);                         \ */
-        /* } while (0) */
+#define sched_trace_task_resume_on(t, i)                                \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 8,                    \
+                                do_sched_trace_task_resume, t);         \
+                trace_litmus_task_resume(t, i);                         \
+        } while (0)
 
 #define sched_trace_task_resume(t)                                      \
         sched_trace_task_resume_on(t, 0)
 
-#define sched_trace_resource_acquire(t, i)/*                            \ */
-        /* do {                                                         \ */
-        /*      trace_litmus_resource_acquire(t, i);                    \ */
-        /* } while (0) */
+#define sched_trace_resource_acquire(t, i)                              \
+        do {                                                            \
+                trace_litmus_resource_acquire(t, i);                    \
+        } while (0)
 
 #define sched_trace_resource_released(t, i)                             \
         do {                                                            \