Removed possible super error

1 files changed, 20 insertions, 10 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index e5b5ef7ea5d1..98abb4638eb8 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -772,11 +772,15 @@ static void mc_task_new(struct task_struct *t, int on_rq, int running)
         TRACE("New mixed criticality task %d\n", t->pid);
 
         /* Assign domain */
-        if (level < CRIT_LEVEL_C)
+        if (level < CRIT_LEVEL_C) {
                 entry = &per_cpu(cpus, get_partition(t));
-        else
+                t->rt_param._domain = entry->crit_entries[level].domain;
+        } else {
                 entry = &per_cpu(cpus, task_cpu(t));
-        t->rt_param._domain = entry->crit_entries[level].domain;
+                t->rt_param._domain =
+                        per_cpu(cpus, 0).crit_entries[CRIT_LEVEL_C].domain;
+        }
+
 
         /* Setup job params */
         release_at(t, litmus_clock());
@@ -784,8 +788,13 @@ static void mc_task_new(struct task_struct *t, int on_rq, int running)
         tsk_mc_data(t)->mc_job.is_ghost = 0;
         if (running) {
                 BUG_ON(entry->scheduled);
-                entry->scheduled = t;
-                tsk_rt(t)->scheduled_on = entry->cpu;
+                if (entry->cpu != CONFIG_FTRACE_CPU) {
+                        entry->scheduled = t;
+                        tsk_rt(t)->scheduled_on = entry->cpu;
+                } else {
+                        tsk_rt(t)->scheduled_on = NO_CPU;
+                        preempt_if_preemptable(NULL, entry->cpu);
+                }
         } else {
                 t->rt_param.scheduled_on = NO_CPU;
         }
@@ -891,16 +900,14 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
         unsigned long flags;
         struct domain *dom;
         struct crit_entry *ce;
-        struct cpu_entry* entry;
+        struct cpu_entry* entry = &__get_cpu_var(cpus);
         int i, out_of_time, sleep, preempt, exists, blocks, global, lower;
         struct task_struct *dtask = NULL, *ready_task = NULL, *next = NULL;
 
         /* Give FTRACE a CPU to run on */
-        if (CONFIG_FTRACE_CPU == smp_processor_id())
+        if (CONFIG_FTRACE_CPU == entry->cpu)
                 return NULL;
 
-        entry = &__get_cpu_var(cpus);
-
         local_irq_save(flags);
 
         /* Litmus gave up because it couldn't access the stack of the CPU
@@ -1212,13 +1219,16 @@ static int __init init_mc(void)
         cpumask_xor(&rt_mask, cpu_online_mask, cpumask_of(CONFIG_FTRACE_CPU));
 #endif
 
-        for_each_rt_cpu(cpu) {
+        for_each_online_cpu(cpu) {
                 entry = &per_cpu(cpus, cpu);
 
                 /* CPU */
                 entry->cpu = cpu;
                 entry->scheduled = NULL;
                 entry->linked = NULL;
+
+                if (cpu == CONFIG_FTRACE_CPU)
+                        continue;
                 raw_spin_lock_init(&entry->lock);
 
 #ifdef CONFIG_PLUGIN_MC_REDIRECT