1 files changed, 14 insertions, 8 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 17f84c9eba79..e20e97810847 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -27,8 +27,6 @@
 #include <litmus/sched_mc.h>
 #include <litmus/ce_domain.h>
 
-/* XXX TODO Do we ever want to move level-A timers? */
-
 /**
  * struct cpu_entry - State of a CPU for the entire MC system
  * @cpu           CPU id
@@ -50,6 +48,9 @@ struct cpu_entry {
         struct list_head        redir;
         raw_spinlock_t          redir_lock;
 #endif
+#ifdef CONFIG_MERGE_TIMERS
+        struct event_group *event_group;
+#endif
 };
 
 DEFINE_PER_CPU(struct cpu_entry, cpus);
@@ -141,7 +142,7 @@ static inline void cancel_ghost(struct crit_entry *ce)
 static inline void arm_ghost(struct crit_entry *ce, lt_t fire)
 {
 #ifdef CONFIG_MERGE_TIMERS
-        add_event(get_event_group_for(crit_cpu(ce)->cpu), &ce->event, fire);
+        add_event(crit_cpu(ce)->event_group, &ce->event, fire);
 #else
         __hrtimer_start_range_ns(&ce->timer,
                                  ns_to_ktime(fire),
@@ -298,7 +299,7 @@ static void fix_global_levels(void)
         struct list_head *pos, *safe;
         struct task_struct *t;
 
-        STRACE("Fixing global levels");
+        STRACE("Fixing global levels\n");
         for_each_online_cpu(c) {
                 e = &per_cpu(cpus, c);
                 raw_spin_lock(&e->redir_lock);
@@ -621,13 +622,12 @@ static void ce_timer_function(struct rt_event *e)
 {
         struct ce_dom_data *ce_data =
                 container_of(e, struct ce_dom_data, event);
-        struct event_group *event_group = get_event_group_for(ce_data->cpu);
         unsigned long flags;
         lt_t next_timer_abs;
 
         local_irq_save(flags);
         next_timer_abs = __ce_timer_function(ce_data);
-        add_event(event_group, e, next_timer_abs);
+        add_event(per_cpu(cpus, ce_data->cpu).event_group, e, next_timer_abs);
         local_irq_restore(flags);
 }
 #else /* else to CONFIG_MERGE_TIMERS */
@@ -945,13 +945,13 @@ static long mc_activate_plugin(void)
         struct domain_data *dom_data;
         struct domain *dom;
         struct domain_data *our_domains[NR_CPUS];
+        struct event_group *event_group;
         int cpu, n = 0;
         long ret;
 
 #ifdef CONFIG_RELEASE_MASTER
         interrupt_cpu = atomic_read(&release_master_cpu);
-#if defined(CONFIG_PLUGIN_MC_REDIRECT) || \
-    (defined(CONFIG_PLUGIN_MC_RELEASE_MASTER) && defined(CONFIG_MERGE_TIMERS))
+#if defined(CONFIG_PLUGIN_MC_REDIRECT) || defined(CONFIG_PLUGIN_MC_RELEASE_MASTER)
         if (NO_CPU == interrupt_cpu) {
                 printk(KERN_ERR "LITMUS-MC: need a release master\n");
                 ret = -EINVAL;
@@ -965,6 +965,12 @@ static long mc_activate_plugin(void)
                 dom = per_cpu(cpus, cpu).crit_entries[CRIT_LEVEL_A].domain;
                 dom_data = domain_data(dom);
                 our_domains[cpu] = dom_data;
+#if defined(CONFIG_MERGE_TIMERS) && defined(CONFIG_PLUGIN_MC_RELEASE_MASTER)
+                event_group = get_event_group_for(interrupt_cpu);
+#elif defined(CONFIG_MERGE_TIMERS) && !defined(CONFIG_PLUGIN_MC_RELEASE_MASTER)
+                event_group = get_event_group_for(cpu);
+#endif
+                per_cpu(cpus, cpu).event_group = event_group;
                 n++;
         }
         ret = mc_ce_set_domains(n, our_domains);