Lets do this

2 files changed, 3 insertions, 15 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index bcc50d3b6947..e40346dd21e0 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -353,7 +353,6 @@ 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) {
@@ -1088,7 +1087,6 @@ 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;
@@ -1163,13 +1161,14 @@ 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];
                 init_crit_entry(ce, level, dom_data, node);
                 bheap_node_init(&ce->node, ce);
-                bheap_insert(cpu_lower_prio, heap, node);
+
+                if (cpu != FTRACE_CPU)
+                        bheap_insert(cpu_lower_prio, heap, node);
         }
 }
 
@@ -1219,7 +1218,6 @@ 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);
 
diff --git a/litmus/sched_mc_ce.c b/litmus/sched_mc_ce.c
index ce71ebef2100..af02dfdbb523 100644
--- a/litmus/sched_mc_ce.c
+++ b/litmus/sched_mc_ce.c
@@ -25,8 +25,6 @@
 #include <litmus/sched_mc.h>
 #include <litmus/ce_domain.h>
 
-#define FTRACE_CPU 6
-
 static struct sched_plugin mc_ce_plugin __cacheline_aligned_in_smp;
 
 #define using_linux_plugin() (litmus == &linux_sched_plugin)
@@ -568,7 +566,6 @@ static int cancel_all_timers(void)
         TRACE("cancel all timers\n");
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 dom = get_domain_for(cpu);
                 ce_data = dom->data;
                 ce_data->should_schedule = NULL;
@@ -600,7 +597,6 @@ static void arm_all_timers(void)
         TRACE("arm all timers\n");
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 dom = get_domain_for(cpu);
                 ce_data = dom->data;
                 pid_table = get_pid_table(cpu);
@@ -660,7 +656,6 @@ long mc_ce_activate_plugin_common(void)
 #endif
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 dom = get_domain_for(cpu);
                 ce_data = dom->data;
                 ce_data->scheduled = NULL;
@@ -683,7 +678,6 @@ static long mc_ce_activate_plugin(void)
         long ret;
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 BUG_ON(NR_CPUS <= n);
                 our_domains[cpu] = &per_cpu(_mc_ce_doms, cpu);
                 n++;
@@ -702,7 +696,6 @@ static void clear_pid_entries(void)
         int cpu, entry;
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 pid_table = get_pid_table(cpu);
                 pid_table->num_pid_entries = 0;
                 pid_table->cycle_time = 0;
@@ -724,7 +717,6 @@ long mc_ce_deactivate_plugin_common(void)
         int cpu;
         cancel_all_timers();
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 per_cpu(domains, cpu) = NULL;
         }
         return 0;
@@ -755,7 +747,6 @@ static int __init init_sched_mc_ce(void)
         int cpu, err;
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 per_cpu(domains, cpu) = NULL;
                 ce_lock = &per_cpu(_mc_ce_dom_locks, cpu);
                 raw_spin_lock_init(ce_lock);
@@ -870,7 +861,6 @@ static int proc_read_ce_file(char *page, char **start, off_t off, int count,
         }
 
         for_each_online_cpu(cpu) {
-                if (cpu == FTRACE_CPU) continue;
                 pid_table = get_pid_table(cpu);
                 for (t = 0; t < pid_table->num_pid_entries; ++t) {
                         err = write_pid_entry(page + n, count - n,