Allow klmirqd threads to be given names.wip-klmirqd-to-aux

1 files changed, 7 insertions, 5 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 1aada57176de..1b4b9d25dbdc 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -556,14 +556,16 @@ int switch_sched_plugin(struct sched_plugin* plugin)
                 ret = litmus->deactivate_plugin();
                 if (0 != ret)
                         goto out;
-                ret = plugin->activate_plugin();
+
+                litmus = plugin;  // switch
+                mb();  // make sure it's seen everywhere.
+                ret = litmus->activate_plugin();
                 if (0 != ret) {
                         printk(KERN_INFO "Can't activate %s (%d).\n",
-                               plugin->plugin_name, ret);
-                        plugin = &linux_sched_plugin;
+                               litmus->plugin_name, ret);
+                        litmus = &linux_sched_plugin;
                 }
-                printk(KERN_INFO "Switching to LITMUS^RT plugin %s.\n", plugin->plugin_name);
-                litmus = plugin;
+                printk(KERN_INFO "Switching to LITMUS^RT plugin %s.\n", litmus->plugin_name);
         } else
                 ret = -EBUSY;
 out: