cleanup: tidy up code before release2007.2

This gets rid of quite a few FIXMEs and TODOs, as well as some cruft.

12 files changed, 22 insertions, 230 deletions

diff --git a/include/linux/litmus.h b/include/linux/litmus.h
index dc39ecbf7e..259594e922 100644
--- a/include/linux/litmus.h
+++ b/include/linux/litmus.h
@@ -35,7 +35,6 @@ typedef enum {
 typedef enum {
         LITMUS_RESERVED_RANGE = 1024,
        
-        ENABLE_WEIGHT_CHANGE_SIGNAL
 } sched_setup_cmd_t;
 
 /*      Runtime modes */
@@ -49,30 +48,14 @@ enum rt_mode_t {
 #define PLUGIN_PFAIR            "pfair"
 #define PLUGIN_PART_EDF         "part_edf"
 #define PLUGIN_GLOBAL_EDF       "global_edf"
-#define PLUGIN_PFAIR_STAGGER    "stagger"
-#define PLUGIN_PFAIR_DESYNC     "desync"
 #define PLUGIN_GLOBAL_EDF_NP    "global_edf_np"
 #define PLUGIN_EDF_HSB          "edf_hsb"
 #define PLUGIN_GSN_EDF          "gsn_edf"
 #define PLUGIN_PSN_EDF          "psn_edf"
 #define PLUGIN_ADAPTIVE         "adaptive"
 
-/*      Additional clone flags  
-        Indicates that the thread is to be used in 
-        realtime mode, therefore it should not be 
-        woken up in a linux manner,
-        we just set its state to TASK_STOPPED
-        It must be prepared and added to the ready queue explicitly
-*/
-
-/*      Type definition for our quantums */
-typedef unsigned long long quantum_t;
-
 extern spolicy sched_policy;
 
-extern unsigned long slot_size;
-extern unsigned long stagger_offset;
-
 /*      RT mode start time      */
 extern volatile unsigned long rt_start_time;
 
@@ -82,10 +65,6 @@ extern atomic_t rt_mode;
 #define get_rt_mode() (atomic_read(&rt_mode))
 #define set_rt_mode(a) atomic_set(&rt_mode,(a))
 
-/* CLEANUP: Should be queue_lock, does it really belong here? */
-extern  spinlock_t litmus_task_set_lock;
-
-
 #define TRACE(fmt, args...) \
         sched_trace_log_message("%d: " fmt, raw_smp_processor_id(), ## args)
 
@@ -99,7 +78,7 @@ extern  spinlock_t litmus_task_set_lock;
         do { if (cond) TRACE("BUG_ON(%s) at %s:%d " \
                              "called from %p current=%s/%d state=%d " \
                              "flags=%x mode=%d partition=%d cpu=%d rtflags=%d"\
-                             " job=%u knp=%d timeslice=%u\n",                   \
+                             " job=%u knp=%d timeslice=%u\n",           \
         #cond, __FILE__, __LINE__, __builtin_return_address(0), current->comm, \
         current->pid, current->state, current->flags, get_rt_mode(), \
         get_partition(current), smp_processor_id(), get_rt_flags(current), \
diff --git a/include/linux/pfair_math.h b/include/linux/pfair_math.h
index dab1778f0b..b2a14e4c54 100644
--- a/include/linux/pfair_math.h
+++ b/include/linux/pfair_math.h
@@ -7,6 +7,9 @@
 #include <linux/litmus.h>
 #include <linux/sched.h>
 
+/*      Type definition for our quantums */
+typedef unsigned long long quantum_t;
+
 /*
 * This file defines  mathematical functions "ceiling", "floor",
 * and PFAIR specific functions for computing the release and
diff --git a/include/linux/sched_plugin.h b/include/linux/sched_plugin.h
index fa0716f0eb..1ea8178b25 100644
--- a/include/linux/sched_plugin.h
+++ b/include/linux/sched_plugin.h
@@ -33,13 +33,6 @@ struct pi_semaphore {
  */
 typedef void runqueue_t;
 
-/********************* real-time callbacks ********************/
-
-/*      Special plugin shutdown hook that clear plugin data structures 
-        Currently is not supported
-*/
-typedef void (*plugin_shutdown_hook_t) (void);
-
 
 /********************* scheduler invocation ******************/
 
@@ -105,7 +98,6 @@ struct sched_plugin {
         int                     ready_to_use;
 
         /*      management interface    */
-        plugin_shutdown_hook_t  shutdown_hook; /*currently unsupported */
         mode_change_t           mode_change;
 
         /*      scheduler invocation    */
diff --git a/kernel/litmus.c b/kernel/litmus.c
index ee1e09a627..8f238ba979 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -19,25 +19,22 @@
 spolicy sched_policy            = SCHED_DEFAULT;
 int     sched_options           = 0;
 
-/*      avoid races with multiple task wake-ups */
-DEFINE_SPINLOCK(litmus_task_set_lock);
 
 /* This is a flag for switching the system into RT mode when it is booted up 
- * In RT-mode non-realtime tasks are shut down and scheduled as spare  
- * time available
+ * In RT-mode non-realtime tasks are scheduled as background tasks.
  */
 
-/*      The system is booting in non-realtime mode */
+/* The system is booting in non-realtime mode */
 atomic_t rt_mode                = ATOMIC_INIT(MODE_NON_RT);
-/*      Here we specify a mode change to be made */
+/* Here we specify a mode change to be made */
 atomic_t new_mode               = ATOMIC_INIT(MODE_NON_RT);
-/*      Number of RT tasks that exist in the system */
+/* Number of RT tasks that exist in the system */
 atomic_t n_rt_tasks             = ATOMIC_INIT(0);
 
-/*      Only one process can perform mode change */
+/* Only one CPU may perform a mode change. */
 static queuelock_t mode_change_lock;
 
-/*      A time instant when we switched to RT mode */
+/* The time instant when we switched to RT mode */
 volatile jiffie_t rt_start_time = 0;
 
 /* To send signals from the scheduler 
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)