4 files changed, 9 insertions, 5 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 5d1c041be809..d580959f9f5c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1534,7 +1534,9 @@ struct task_struct {
 
         /*** LITMUS RT parameters and state ***/
         struct rt_param rt_param;
+#ifdef CONFIG_REALTIME_AUX_TASKS
         struct aux_data aux_data;
+#endif
         /*****/
 
         /* references to PI semaphores, etc. */
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index c45ba23d7650..8b9e14c461dc 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -285,7 +285,7 @@ struct rt_param {
 #endif
 
 
-#ifdef CONFIG_LITMUS_LOCKING
+#ifdef CONFIG_REALTIME_AUX_TASKS
         unsigned int            is_aux_task:1;
         unsigned int            has_aux_tasks:1;
 
@@ -358,12 +358,14 @@ struct rt_param {
         struct control_page * ctrl_page;
 };
 
+#ifdef CONFIG_REALTIME_AUX_TASKS
 struct aux_data
 {
         struct list_head        aux_tasks;
         struct binheap          aux_task_owners;
         unsigned int            initialized:1;
 };
+#endif
 
 /*      Possible RT flags       */
 #define RT_F_RUNNING            0x00000000
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index 4fd92956d13f..c86b743408ed 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -21,6 +21,6 @@
 #define __NR_litmus_dgl_unlock  __LSC(13)
 #define __NR_register_nv_device                 __LSC(14)
 
-#define __NR_slave_non_rt_threads       _LSC(15)
+#define __NR_set_aux_tasks              _LSC(15)
 
 #define NR_litmus_syscalls 16
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index abb45c181e8e..3825bc129dbd 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -33,10 +33,10 @@ __SYSCALL(__NR_null_call, sys_null_call)
 __SYSCALL(__NR_litmus_dgl_lock, sys_litmus_dgl_lock)
 #define __NR_litmus_dgl_unlock          __LSC(13)
 __SYSCALL(__NR_litmus_dgl_unlock, sys_litmus_dgl_unlock)
-#define __NR_register_nv_device                 __LSC(14)
+#define __NR_register_nv_device         __LSC(14)
 __SYSCALL(__NR_register_nv_device, sys_register_nv_device)
 
-#define __NR_slave_non_rt_threads       __LSC(15)
-__SYSCALL(__NR_slave_non_rt_threads, sys_slave_non_rt_threads)
+#define __NR_set_aux_tasks                      __LSC(15)
+__SYSCALL(__NR_set_aux_tasks, sys_set_aux_tasks)
 
 #define NR_litmus_syscalls 16