2 files changed, 8 insertions, 0 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index d515d1af1096..674528eece14 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -9,7 +9,9 @@
 #include <linux/jiffies.h>
 #include <litmus/sched_trace.h>
 
+#ifdef CONFIG_RELEASE_MASTER
 extern atomic_t release_master_cpu;
+#endif
 
 extern atomic_t __log_seq_no;
 
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 9bf980713474..59e6b54e9281 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -28,7 +28,10 @@ typedef struct _rt_domain {
         /* real-time tasks waiting for release are in here */
         raw_spinlock_t                  release_lock;
         struct release_queue            release_queue;
+
+#ifdef CONFIG_RELEASE_MASTER
         int                             release_master;
+#endif
 
         /* for moving tasks to the release queue */
         raw_spinlock_t                  tobe_lock;
@@ -52,8 +55,11 @@ struct release_heap {
         struct bheap                    heap;
         /* used to trigger the release */
         struct hrtimer                  timer;
+
+#ifdef CONFIG_RELEASE_MASTER
         /* used to delegate releases */
         struct hrtimer_start_on_info    info;
+#endif
         /* required for the timer callback */
         rt_domain_t*                    dom;
 };