Add ifdef's for CONFIG_PLUGIN_MC and CONFIG_MERGE_TIMERS.

1 files changed, 8 insertions, 1 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 98a30b88baab..b70c94695a58 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -12,13 +12,16 @@
 #include <linux/slab.h>
 
 #include <litmus/litmus.h>
-#include <litmus/event_group.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/sched_trace.h>
 #include <litmus/rt_domain.h>
 #include <litmus/trace.h>
 #include <litmus/bheap.h>
 
+#ifdef CONFIG_MERGE_TIMERS
+#include <litmus/event_group.h>
+#endif
+
 /* Uncomment when debugging timer races... */
 #if 1
 #define VTRACE_TASK TRACE_TASK
@@ -53,11 +56,13 @@ static void do_release(struct release_heap *rh)
 {
         unsigned long flags;
 
+#ifdef CONFIG_PLUGIN_MC
         if (CRIT_LEVEL_B == rh->dom->level)  {
                 TS_LVLB_RELEASE_START;
         } else {
                 TS_LVLC_RELEASE_START;
         }
+#endif
 
         TS_RELEASE_LATENCY(rh->release_time);
 
@@ -75,11 +80,13 @@ static void do_release(struct release_heap *rh)
         /* call release callback */
         rh->dom->release_jobs(rh->dom, &rh->heap);
 
+#ifdef CONFIG_PLUGIN_MC
         if (CRIT_LEVEL_B == rh->dom->level) {
                 TS_LVLB_RELEASE_END;
         } else {
                 TS_LVLC_RELEASE_END;
         }
+#endif
 }
 
 #ifdef CONFIG_MERGE_TIMERS