Fix klmirqd plugin switching to not panic.

1 files changed, 10 insertions, 13 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index fa244ba53e22..f98aa9d778a2 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -445,8 +445,8 @@ long __litmus_admit_task(struct task_struct* tsk)
 #endif
 #ifdef CONFIG_LITMUS_SOFTIRQD
         /* not an interrupt thread by default */
-        tsk_rt(tsk)->is_interrupt_thread = 0;
-    tsk_rt(tsk)->klmirqd_info = NULL;
+        //tsk_rt(tsk)->is_interrupt_thread = 0;
+    //tsk_rt(tsk)->klmirqd_info = NULL;
 #endif
 
         retval = litmus->admit_task(tsk);
@@ -523,11 +523,6 @@ static void synch_on_plugin_switch(void* info)
                 cpu_relax();
 }
 
-/* Switching a plugin in use is tricky.
- * We must watch out that no real-time tasks exists
- * (and that none is created in parallel) and that the plugin is not
- * currently in use on any processor (in theory).
- */
 int switch_sched_plugin(struct sched_plugin* plugin)
 {
         //unsigned long flags;
@@ -535,20 +530,21 @@ int switch_sched_plugin(struct sched_plugin* plugin)
 
         BUG_ON(!plugin);
 
+#ifdef CONFIG_LITMUS_SOFTIRQD
+        if (!klmirqd_is_dead()) {
+                kill_klmirqd();
+        }
+#endif
+
         /* forbid other cpus to use the plugin */
         atomic_set(&cannot_use_plugin, 1);
         /* 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())
+        while (atomic_read(&cannot_use_plugin) < num_online_cpus()) {
                 cpu_relax();
-
-#ifdef CONFIG_LITMUS_SOFTIRQD
-        if (!klmirqd_is_dead()) {
-                kill_klmirqd();
         }
-#endif
 
         /* stop task transitions */
         //raw_spin_lock_irqsave(&task_transition_lock, flags);
@@ -571,6 +567,7 @@ int switch_sched_plugin(struct sched_plugin* plugin)
 out:
         //raw_spin_unlock_irqrestore(&task_transition_lock, flags);
         atomic_set(&cannot_use_plugin, 0);
+
         return ret;
 }