Merge branch 'wip-merge-2.6.36' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-merge-2.6.36

3 files changed, 23 insertions, 2 deletions

diff --git a/litmus/Kconfig b/litmus/Kconfig
index d62c417f261e..a2f267870f29 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -174,6 +174,21 @@ config SCHED_DEBUG_TRACE_SHIFT
         character device node should be created at /dev/litmus/log. The buffer
         can be flushed using cat, e.g., 'cat /dev/litmus/log > my_log_file.txt'.
 
+config SCHED_DEBUG_TRACE_CALLER
+       bool "Include [function@file:line] tag in TRACE() log"
+       depends on SCHED_DEBUG_TRACE
+       default n
+       help
+         With this option enabled, TRACE() prepends
+
+              "[<function name>@<filename>:<line number>]"
+
+         to each message in the debug log. Enable this to aid in figuring out
+         what was called in which order. The downside is that it adds a lot of
+         clutter.
+
+         If unsure, say No.
+
 endmenu
 
 endmenu
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 0756d0156f8f..8efd3f9ef7ee 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -382,7 +382,8 @@ void litmus_exit_task(struct task_struct* tsk)
 /* IPI callback to synchronize plugin switching */
 static void synch_on_plugin_switch(void* info)
 {
-        while (atomic_read(&cannot_use_plugin))
+        atomic_inc(&cannot_use_plugin);
+        while (atomic_read(&cannot_use_plugin) > 0)
                 cpu_relax();
 }
 
@@ -403,6 +404,10 @@ int switch_sched_plugin(struct sched_plugin* plugin)
         /* send IPI to force other CPUs to synch with us */
         smp_call_function(synch_on_plugin_switch, NULL, 0);
 
+        /* wait until all other CPUs have started synch */
+        while (atomic_read(&cannot_use_plugin) < num_online_cpus())
+                cpu_relax();
+
         /* stop task transitions */
         raw_spin_lock_irqsave(&task_transition_lock, flags);
 
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 111e4fb1c62b..8c9513d33f59 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -708,7 +708,8 @@ static long cedf_activate_plugin(void)
                                 if (cpumask_test_cpu(cpu, cedf[j].cpu_map))
                                         break;
                         /* if it is in a cluster go to next cpu */
-                        if (cpumask_test_cpu(cpu, cedf[j].cpu_map))
+                        if (j < num_clusters &&
+                                        cpumask_test_cpu(cpu, cedf[j].cpu_map))
                                 continue;
 
                         /* this cpu isn't in any cluster */