1 files changed, 10 insertions, 13 deletions

diff --git a/litmus/aux_tasks.c b/litmus/aux_tasks.c
index 5057137bbbea..b0617accdf7f 100644
--- a/litmus/aux_tasks.c
+++ b/litmus/aux_tasks.c
@@ -1,8 +1,8 @@
-#ifdef CONFIG_LITMUS_LOCKING
-
 #include <litmus/sched_plugin.h>
 #include <litmus/trace.h>
 #include <litmus/litmus.h>
+
+#ifdef CONFIG_REALTIME_AUX_TASKS
 #include <litmus/rt_param.h>
 #include <litmus/aux_tasks.h>
 
@@ -23,14 +23,11 @@ static int admit_aux_task(struct task_struct *t)
          * fail-safe.
          */
         struct rt_task tp = {
-                //.period = MAGIC_AUX_TASK_PERIOD,
-                //.relative_deadline = MAGIC_AUX_TASK_PERIOD,
-                .period = 1000000,   /* has to wait 1 ms before it can run again once it has exhausted budget */
+                .period = 1000000,   /* 1ms */
                 .relative_deadline = 1000000,
                 .exec_cost = 1000000, /* allow full utilization */
                 .phase = 0,
                 .cpu = task_cpu(leader),  /* take CPU of group leader */
-                //.budget_policy = NO_ENFORCEMENT,
                 .budget_policy = QUANTUM_ENFORCEMENT,
                 .budget_signal_policy = NO_SIGNALS,
                 .cls = RT_CLASS_BEST_EFFORT
@@ -280,7 +277,7 @@ static int aux_task_owner_max_priority_order(struct binheap_node *a,
 }
 
 
-static long __do_enable_slave_non_rt_threads(void)
+static long __do_enable_aux_tasks(void)
 {
         long retval = 0;
         struct task_struct *leader;
@@ -344,7 +341,7 @@ static long __do_enable_slave_non_rt_threads(void)
         return retval;
 }
 
-static long __do_disable_slave_non_rt_threads(void)
+static long __do_disable_aux_tasks(void)
 {
         long retval = 0;
         struct task_struct *leader;
@@ -385,17 +382,17 @@ static long __do_disable_slave_non_rt_threads(void)
         return retval;
 }
 
-asmlinkage long sys_slave_non_rt_threads(int enable)
+asmlinkage long sys_set_aux_tasks(int enable)
 {
         long retval;
 
         read_lock_irq(&tasklist_lock);
 
         if (enable) {
-                retval = __do_enable_slave_non_rt_threads();
+                retval = __do_enable_aux_tasks();
         }
         else {
-                retval = __do_disable_slave_non_rt_threads();
+                retval = __do_disable_aux_tasks();
         }
 
         read_unlock_irq(&tasklist_lock);
@@ -405,9 +402,9 @@ asmlinkage long sys_slave_non_rt_threads(int enable)
 
 #else
 
-asmlinkage long sys_slave_non_rt_tasks(int enable)
+asmlinkage long sys_set_aux_tasks(int enable)
 {
-        printk("Unsupported. Recompile with CONFIG_LITMUS_LOCKING.\n");
+        printk("Unsupported. Recompile with CONFIG_REALTIME_AUX_TASKS.\n");
         return -EINVAL;
 }