Merge branch 'wip-mc' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-mc

2 files changed, 8 insertions, 3 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 4fe4aadea8eb..e0c84716d87a 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -12,7 +12,8 @@
 enum task_type_marker {
         TSK_BE,
         TSK_RT,
-        TSK_UNKNOWN
+        TSK_UNKNOWN,
+        TSK_LVLA
 };
 
 struct timestamp {
@@ -111,6 +112,10 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 #define TS_LVLA_RELEASE_START           DTIMESTAMP(112, TSK_RT)
 #define TS_LVLA_RELEASE_END             DTIMESTAMP(113, TSK_RT)
 
+#define TS_LVLA_SCHED_START             DTIMESTAMP(114, TSK_UNKNOWN)
+#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 */
 #define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */