1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index d7fd42a431..5ad4276e4b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -61,9 +61,11 @@
 #include <linux/sched_plugin.h>
 #include <linux/sched_trace.h>
 #include <linux/rt_param.h>
-
 #include <linux/trace.h>
 
+/* LITMUS: avoid races with multiple task wake-ups */
+DEFINE_SPINLOCK(litmus_task_set_lock);
+
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
  * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],
@@ -1693,7 +1695,6 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 
         if (clone_flags & CLONE_REALTIME) {
                 /* just mark the task as stopped */
-                /* CLEANUP: Do we have to remove the task from the rq? */
                 p->state = TASK_STOPPED;
                 return;
         }
@@ -5541,7 +5542,7 @@ static struct notifier_block __cpuinitdata migration_notifier = {
         .priority = 10
 };
 
-int __init linux_migration_init(void)
+int __init migration_init(void)
 {
         void *cpu = (void *)(long)smp_processor_id();
         int err;
@@ -7003,7 +7004,7 @@ static int update_sched_domains(struct notifier_block *nfb,
         return NOTIFY_OK;
 }
 
-void __init linux_sched_init_smp(void)
+void __init sched_init_smp(void)
 {
         cpumask_t non_isolated_cpus;
 
@@ -7036,7 +7037,7 @@ int in_sched_functions(unsigned long addr)
                 && addr < (unsigned long)__sched_text_end);
 }
 
-void __init linux_sched_init(void)
+void __init sched_init(void)
 {
         int i, j, k;