aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2011-10-14 00:20:04 -0400
committerJonathan Herman <hermanjl@cs.unc.edu>2011-10-14 00:20:04 -0400
commit361e2a6448405b1086441d08737f74be4a1f2ec8 (patch)
tree560fd80e0c6064d10988b18bbc4fd5eaff286792
parent3d00edf817b71eb95440c72689e0c5657fd29dd0 (diff)
Fixed dummy page fault thing
-rw-r--r--litmus/sched_mc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 8828919dfcf2..e5b5ef7ea5d1 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -891,14 +891,16 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
891 unsigned long flags; 891 unsigned long flags;
892 struct domain *dom; 892 struct domain *dom;
893 struct crit_entry *ce; 893 struct crit_entry *ce;
894 struct cpu_entry* entry = &__get_cpu_var(cpus); 894 struct cpu_entry* entry;
895 int i, out_of_time, sleep, preempt, exists, blocks, global, lower; 895 int i, out_of_time, sleep, preempt, exists, blocks, global, lower;
896 struct task_struct *dtask = NULL, *ready_task = NULL, *next = NULL; 896 struct task_struct *dtask = NULL, *ready_task = NULL, *next = NULL;
897 897
898 /* Give FTRACE a CPU to run on */ 898 /* Give FTRACE a CPU to run on */
899 if (CONFIG_FTRACE_CPU == entry->cpu) 899 if (CONFIG_FTRACE_CPU == smp_processor_id())
900 return NULL; 900 return NULL;
901 901
902 entry = &__get_cpu_var(cpus);
903
902 local_irq_save(flags); 904 local_irq_save(flags);
903 905
904 /* Litmus gave up because it couldn't access the stack of the CPU 906 /* Litmus gave up because it couldn't access the stack of the CPU