Merge branch 'wip-mc' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-mc

1 files changed, 13 insertions, 6 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index db92e849f084..fbd91c829619 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -166,7 +166,7 @@ static void reinit_release_heap(rt_domain_t *rt, struct task_struct* t)
 
 #ifdef CONFIG_MERGE_TIMERS
         rh->event.prio = rt->prio;
-        cancel_event(rt->event_group, &rh->event);
+        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
@@ -188,7 +188,11 @@ static void reinit_release_heap(rt_domain_t *rt, struct task_struct* t)
 
 }
 
+#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
 {
 #ifdef CONFIG_MERGE_TIMERS
         add_event(rh->dom->event_group, &rh->event, rh->release_time);
@@ -200,8 +204,7 @@ static void arm_release_timer(struct release_heap *rh)
          */
 
 #ifdef CONFIG_RELEASE_MASTER
-        if (rt->release_master == NO_CPU &&
-            target_cpu == NO_CPU)
+        if (rh->dom->release_master == NO_CPU && target_cpu == NO_CPU)
 #endif
                 __hrtimer_start_range_ns(&rh->timer,
                                          ns_to_ktime(rh->release_time),
@@ -210,7 +213,7 @@ static void arm_release_timer(struct release_heap *rh)
         else
                 hrtimer_start_on(/* target_cpu overrides release master */
                                  (target_cpu != NO_CPU ?
-                                  target_cpu : rt->release_master),
+                                  target_cpu : rh->dom->release_master),
                                  &rh->info, &rh->timer,
                                  ns_to_ktime(rh->release_time),
                                  HRTIMER_MODE_ABS_PINNED);
@@ -278,9 +281,13 @@ static void setup_release(rt_domain_t *_rt)
                  * owner do the arming (which is the "first" task to reference
                  * this release_heap anyway).
                  */
-                if (rh == tsk_rt(t)->rel_heap)
+                if (rh == tsk_rt(t)->rel_heap) {
+#ifdef CONFIG_RELEASE_MASTER
+                        arm_release_timer_on(rh, target_cpu);
+#else
                         arm_release_timer(rh);
-                else
+#endif
+                } else
                         VTRACE_TASK(t, "0x%p is not my timer\n", &rh->timer);
         }
 }