1 files changed, 17 insertions, 2 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 53c24ac2172c..bcc50d3b6947 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -60,6 +60,8 @@ DEFINE_PER_CPU(struct cpu_entry, cpus);
 static int interrupt_cpu;
 #endif
 
+#define FTRACE_CPU 6
+
 #define domain_data(dom)  (container_of(dom, struct domain_data, domain))
 #define is_global(dom)    (domain_data(dom)->heap)
 #define is_global_task(t) (is_global(get_task_domain(t)))
@@ -351,6 +353,7 @@ static void fix_global_levels(void)
 
         STRACE("Fixing global levels\n");
         for_each_online_cpu(c) {
+                if (c == FTRACE_CPU) continue;
                 e = &per_cpu(cpus, c);
                 raw_spin_lock(&e->redir_lock);
                 list_for_each_safe(pos, safe, &e->redir) {
@@ -781,8 +784,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 != FTRACE_CPU) {
+                        entry->scheduled = t;
+                        tsk_rt(t)->scheduled_on = entry->cpu;
+                } else {
+                        t->rt_param.scheduled_on = NO_CPU;
+                        preempt_if_preemptable(NULL, entry->cpu);
+                }
         } else {
                 t->rt_param.scheduled_on = NO_CPU;
         }
@@ -892,6 +900,9 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
         int i, out_of_time, sleep, preempt, exists, blocks, global, lower;
         struct task_struct *dtask = NULL, *ready_task = NULL, *next = NULL;
 
+        if (entry->cpu == FTRACE_CPU)
+                return NULL;
+
         local_irq_save(flags);
 
         /* Litmus gave up because it couldn't access the stack of the CPU
@@ -1077,6 +1088,7 @@ static long mc_activate_plugin(void)
 
         for_each_online_cpu(cpu) {
                 BUG_ON(NR_CPUS <= n);
+                if (cpu == FTRACE_CPU) continue;
                 dom = per_cpu(cpus, cpu).crit_entries[CRIT_LEVEL_A].domain;
                 dom_data = domain_data(dom);
                 our_domains[cpu] = dom_data;
@@ -1151,6 +1163,7 @@ static void init_global_domain(struct domain_data *dom_data, enum crit_level lev
         bheap_init(heap);
 
         for_each_online_cpu(cpu) {
+                if (cpu == FTRACE_CPU) continue;
                 entry = &per_cpu(cpus, cpu);
                 node = &nodes[cpu];
                 ce = &entry->crit_entries[level];
@@ -1206,6 +1219,8 @@ static int __init init_mc(void)
                 entry->cpu = cpu;
                 entry->scheduled = NULL;
                 entry->linked = NULL;
+                if (cpu == FTRACE_CPU) continue;
+
                 raw_spin_lock_init(&entry->lock);
 
 #ifdef CONFIG_PLUGIN_MC_REDIRECT