Disabled release master work.

1 files changed, 50 insertions, 50 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 6e6a1236bb25..098ea000f5de 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -194,10 +194,10 @@ static void reinit_release_heap(rt_domain_t *rt, struct task_struct* t)
         /* use pre-allocated release heap */
         rh = tsk_rt(t)->rel_heap;
 
-#ifdef CONFIG_MERGE_TIMERS
-        rh->event.prio = rt->prio;
-        cancel_event(&rh->event);
-#else
+/* #ifdef CONFIG_MERGE_TIMERS */
+/*      rh->event.prio = rt->prio; */
+/*      cancel_event(&rh->event); */
+/* #else */
         /* Make sure it is safe to use.  The timer callback could still
          * be executing on another CPU; hrtimer_cancel() will wait
          * until the timer callback has completed.  However, under no
@@ -209,20 +209,20 @@ static void reinit_release_heap(rt_domain_t *rt, struct task_struct* t)
          */
         BUG_ON(hrtimer_cancel(&rh->timer));
 
-#ifdef CONFIG_RELEASE_MASTER
-        atomic_set(&rh->info.state, HRTIMER_START_ON_INACTIVE);
-#endif
-#endif
+/* #ifdef CONFIG_RELEASE_MASTER */
+/*      atomic_set(&rh->info.state, HRTIMER_START_ON_INACTIVE); */
+/* #endif */
+/* #endif */
         /* initialize */
         bheap_init(&rh->heap);
 
 }
 
-#ifdef CONFIG_RELEASE_MASTER
-static void arm_release_timer_on(struct release_heap *rh, int target_cpu)
-#else
+/* #ifdef CONFIG_RELEASE_MASTER */
+/* static void arm_release_timer_on(struct release_heap *rh, int target_cpu) */
+/* #else */
 static void arm_release_timer(struct release_heap *rh)
-#endif
+//#endif
 {
 #ifdef CONFIG_MERGE_TIMERS
         add_event(rh->dom->event_group, &rh->event, rh->release_time);
@@ -233,21 +233,21 @@ static void arm_release_timer(struct release_heap *rh)
          * PINNED mode is ok on both local and remote CPU
          */
 
-#ifdef CONFIG_RELEASE_MASTER
-        if (rh->dom->release_master == NO_CPU && target_cpu == NO_CPU)
-#endif
+/* #ifdef CONFIG_RELEASE_MASTER */
+/*      if (rh->dom->release_master == NO_CPU && target_cpu == NO_CPU) */
+/* #endif */
                 __hrtimer_start_range_ns(&rh->timer,
                                          ns_to_ktime(rh->release_time),
                                          0, HRTIMER_MODE_ABS_PINNED, 0);
-#ifdef CONFIG_RELEASE_MASTER
-        else
-                hrtimer_start_on(/* target_cpu overrides release master */
-                                 (target_cpu != NO_CPU ?
-                                  target_cpu : rh->dom->release_master),
-                                 &rh->info, &rh->timer,
-                                 ns_to_ktime(rh->release_time),
-                                 HRTIMER_MODE_ABS_PINNED);
-#endif
+/* #ifdef CONFIG_RELEASE_MASTER */
+/*      else */
+/*              hrtimer_start_on(/\* target_cpu overrides release master *\/ */
+/*                               (target_cpu != NO_CPU ? */
+/*                                target_cpu : rh->dom->release_master), */
+/*                               &rh->info, &rh->timer, */
+/*                               ns_to_ktime(rh->release_time), */
+/*                               HRTIMER_MODE_ABS_PINNED); */
+/* #endif */
 #endif
 }
 
@@ -259,12 +259,12 @@ static void arm_release_timer(struct release_heap *rh)
  * - tobe_lock taken
  * - IRQ disabled
  */
-#ifdef CONFIG_RELEASE_MASTER
-#define setup_release(t) setup_release_on((t), NO_CPU)
-static void setup_release_on(rt_domain_t *_rt , int target_cpu)
-#else
+/* #ifdef CONFIG_RELEASE_MASTER */
+/* #define setup_release(t) setup_release_on((t), NO_CPU) */
+/* static void setup_release_on(rt_domain_t *_rt , int target_cpu) */
+/* #else */
 static void setup_release(rt_domain_t *_rt)
-#endif
+/* #endif */
 {
         rt_domain_t *rt = _rt;
         struct list_head list;
@@ -312,11 +312,11 @@ static void setup_release(rt_domain_t *_rt)
                  * this release_heap anyway).
                  */
                 if (rh == tsk_rt(t)->rel_heap) {
-#ifdef CONFIG_RELEASE_MASTER
-                        arm_release_timer_on(rh, target_cpu);
-#else
+/* #ifdef CONFIG_RELEASE_MASTER */
+/*                      arm_release_timer_on(rh, target_cpu); */
+/* #else */
                         arm_release_timer(rh);
-#endif
+/* #endif */
                 }
         }
 }
@@ -336,9 +336,9 @@ void rt_domain_init(rt_domain_t *rt,
         if (!order)
                 order = dummy_order;
 
-#if defined(CONFIG_RELEASE_MASTER) && !defined(CONFIG_MERGE_TIMERS)
-        rt->release_master = NO_CPU;
-#endif
+/* #if defined(CONFIG_RELEASE_MASTER) && !defined(CONFIG_MERGE_TIMERS) */
+/*      rt->release_master = NO_CPU; */
+/* #endif */
 
         bheap_init(&rt->ready_queue);
         INIT_LIST_HEAD(&rt->tobe_released);
@@ -380,23 +380,23 @@ void __merge_ready(rt_domain_t* rt, struct bheap* tasks)
 }
 
 
-#ifdef CONFIG_RELEASE_MASTER
-void __add_release_on(rt_domain_t* rt, struct task_struct *task,
-                      int target_cpu)
-{
-        VTRACE_TASK(task, "add_release_on(), rel=%llu, target=%d\n",
-                   get_release(task), target_cpu);
-        list_add(&tsk_rt(task)->list, &rt->tobe_released);
-        task->rt_param.domain = rt;
+/* #ifdef CONFIG_RELEASE_MASTER */
+/* void __add_release_on(rt_domain_t* rt, struct task_struct *task, */
+/*                    int target_cpu) */
+/* { */
+/*      VTRACE_TASK(task, "add_release_on(), rel=%llu, target=%d\n", */
+/*                 get_release(task), target_cpu); */
+/*      list_add(&tsk_rt(task)->list, &rt->tobe_released); */
+/*      task->rt_param.domain = rt; */
 
-        /* start release timer */
-        TS_SCHED2_START(task);
+/*      /\* start release timer *\/ */
+/*      TS_SCHED2_START(task); */
 
-        setup_release_on(rt, target_cpu);
+/*      setup_release_on(rt, target_cpu); */
 
-        TS_SCHED2_END(task);
-}
-#endif
+/*      TS_SCHED2_END(task); */
+/* } */
+/* #endif */
 
 /* add_release - add a real-time task to the rt release queue.
  * @task:        the sleeping task