fix level-a schedule event id and a bad define in rt_domain.h

3 files changed, 9 insertions, 5 deletions

diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 59350fb78d4f..f98d47ccbb0b 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -31,10 +31,10 @@ typedef struct _rt_domain {
         raw_spinlock_t                  release_lock;
         struct release_queue            release_queue;
 
-#ifdef CONFIG_MERGE_TIMERS
+#if defined(CONFIG_MERGE_TIMERS)
         struct event_group*             event_group;
         int                             prio;
-#elif  CONFIG_RELEASE_MASTER
+#elif defined(CONFIG_RELEASE_MASTER)
         int                             release_master;
 #endif
 
diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index db91ff69b51e..e0c84716d87a 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -113,7 +113,8 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 #define TS_LVLA_RELEASE_END             DTIMESTAMP(113, TSK_RT)
 
 #define TS_LVLA_SCHED_START             DTIMESTAMP(114, TSK_UNKNOWN)
-#define TS_LVLA_SCHED_END(t)            TTIMESTAMP(115, t)
+#define TS_LVLA_SCHED_END_ID            115
+#define TS_LVLA_SCHED_END(t)            TTIMESTAMP(TS_LVLA_SCHED_END_ID, t)
 
 
 #define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */  /* currently unused */
diff --git a/litmus/trace.c b/litmus/trace.c
index 417422d2f16d..1d4593aec71d 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -4,6 +4,9 @@
 #include <litmus/ftdev.h>
 #include <litmus/litmus.h>
 #include <litmus/trace.h>
+
+#include <litmus/domain.h>
+#include <litmus/event_group.h>
 #include <litmus/sched_mc.h>
 
 /******************************************************************************/
@@ -82,11 +85,11 @@ feather_callback void save_timestamp_def(unsigned long event,
 feather_callback void save_timestamp_task(unsigned long event,
                                           unsigned long t_ptr)
 {
-        struct task_struct *ts = t_ptr;
+        struct task_struct *ts = (struct task_struct*) t_ptr;
         int rt = is_realtime(ts);
         uint8_t type = rt ? TSK_RT : TSK_BE;
 
-        if (TS_LVLA_SCHED_END == event) {
+        if (TS_LVLA_SCHED_END_ID == event) {
                 if (rt && CRIT_LEVEL_A == tsk_mc_crit(ts))
                         type = TSK_LVLA;
         }