More ftrace madness

1 files changed, 10 insertions, 0 deletions

diff --git a/litmus/sched_mc_ce.c b/litmus/sched_mc_ce.c
index af02dfdbb523..ce71ebef2100 100644
--- a/litmus/sched_mc_ce.c
+++ b/litmus/sched_mc_ce.c
@@ -25,6 +25,8 @@
 #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)
@@ -566,6 +568,7 @@ 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;
@@ -597,6 +600,7 @@ 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);
@@ -656,6 +660,7 @@ 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;
@@ -678,6 +683,7 @@ 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++;
@@ -696,6 +702,7 @@ 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;
@@ -717,6 +724,7 @@ 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;
@@ -747,6 +755,7 @@ 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);
@@ -861,6 +870,7 @@ 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,