Remove some really old left-overs.

This is a long-overdue cleanup.`

9 files changed, 4 insertions, 36 deletions

diff --git a/include/linux/litmus.h b/include/linux/litmus.h
index 408359f957..df8652d7ea 100644
--- a/include/linux/litmus.h
+++ b/include/linux/litmus.h
@@ -31,26 +31,12 @@ typedef enum {
         SCHED_INVALID           = -1,
 } spolicy;
 
-/* no options */
-#define SCHED_NONE              0
-/* make scheduling decisions at quantum boundaries */
-#define SCHED_QUANTUM           1       
-/* only schedule RT tasks at slot boundaries */
-#define SCHED_RT_AT_BOUND       2       
-/* default slot size - number of 1ms jiffies in a scheduling quantum */
-#define DEFAULT_SLOT_SIZE       1       
-/* stagger value for no staggering of slot boundaries */
-#define DEFAULT_NO_STAGGER      0
-/* default stagger - number of 1ms jiffies by which processors 
- * are staggered, modulo the slot size
- */
-#define DEFAULT_STAGGER         2
 
 /*      Runtime modes */
-/* CLEANUP: Should maybe an enum? */
-#define MAX_MODES       2
-#define MODE_NON_RT     0
-#define MODE_RT_RUN     1
+enum rt_mode_t {
+        MODE_NON_RT = 0,
+        MODE_RT_RUN = 1
+};
 
 /*      Plugin boot options, for convenience */
 #define PLUGIN_LINUX            "linux"
@@ -77,9 +63,6 @@ typedef enum {
 typedef unsigned long long quantum_t;
 
 extern spolicy sched_policy;
-extern int sched_options;
-/*      Make this function available to plugins */
-void set_sched_options(int);
 
 extern unsigned long slot_size;
 extern unsigned long stagger_offset;
diff --git a/kernel/litmus.c b/kernel/litmus.c
index 217b0a0357..770f67af8f 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -301,13 +301,6 @@ asmlinkage long sys_query_job_no(unsigned int __user *job)
 }
 
 
-
-/* Set scheduling options for all cpus. */
-void set_sched_options(int options)
-{
-        sched_options = options;
-}
-
 /* The LITMUS tick function. It manages the change to and from real-time mode
  * and then calls the plugin's tick function.
  */
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c
index 14a8db7638..1942422452 100644
--- a/kernel/sched_adaptive.c
+++ b/kernel/sched_adaptive.c
@@ -802,7 +802,6 @@ sched_plugin_t *__init init_adaptive_plugin(void)
                 }               
 
                 queue_lock_init(&adaptive_lock);
-                set_sched_options(SCHED_NONE);
                 edf_domain_init(&adaptive, NULL);
                 s_plugin = INIT_SCHED_PLUGIN;
         }
diff --git a/kernel/sched_edf_hsb.c b/kernel/sched_edf_hsb.c
index 07820054b7..b53a277658 100644
--- a/kernel/sched_edf_hsb.c
+++ b/kernel/sched_edf_hsb.c
@@ -1787,7 +1787,6 @@ sched_plugin_t *__init init_edf_hsb_plugin(void)
 
         if (!s_plugin.ready_to_use)
         {
-                set_sched_options(SCHED_NONE);
                 capacity_queue_init(&cap_queue);
                 edf_domain_init(&srt, srt_check_resched);
                 edf_domain_init(&be, be_check_resched);
diff --git a/kernel/sched_global_edf.c b/kernel/sched_global_edf.c
index 3ca46c1fb9..b00674a5c4 100644
--- a/kernel/sched_global_edf.c
+++ b/kernel/sched_global_edf.c
@@ -447,7 +447,6 @@ sched_plugin_t *__init init_global_edf_plugin(void)
 {
         if (!s_plugin.ready_to_use)
         {
-                set_sched_options(SCHED_NONE);
                 edf_domain_init(&gedf, gedf_check_resched);
                 s_plugin = INIT_SCHED_PLUGIN;
         }
@@ -558,7 +557,6 @@ sched_plugin_t* __init init_global_edf_np_plugin(void)
 {
         if (!s_plugin.ready_to_use)
         {
-                set_sched_options(SCHED_NONE);
                 edf_domain_init(&gedf, gedf_np_check_resched);
                 s_plugin = INIT_SCHED_PLUGIN_NP;
         }
diff --git a/kernel/sched_gsn_edf.c b/kernel/sched_gsn_edf.c
index 5ff2670727..2dae550f29 100644
--- a/kernel/sched_gsn_edf.c
+++ b/kernel/sched_gsn_edf.c
@@ -806,7 +806,6 @@ sched_plugin_t *__init init_gsn_edf_plugin(void)
                 }               
 
                 queue_lock_init(&gsnedf_lock);
-                set_sched_options(SCHED_NONE);
                 edf_domain_init(&gsnedf, NULL);
                 s_plugin = INIT_SCHED_PLUGIN;
         }
diff --git a/kernel/sched_part_edf.c b/kernel/sched_part_edf.c
index dee761525c..57e22d3d68 100644
--- a/kernel/sched_part_edf.c
+++ b/kernel/sched_part_edf.c
@@ -329,7 +329,6 @@ sched_plugin_t *__init init_part_edf_plugin(void)
 
         if (!s_plugin.ready_to_use)
         {
-                set_sched_options(SCHED_NONE);
                 for (i = 0; i < NR_CPUS; i++)
                 {
                         part_edf_domain_init(remote_pedf(i), 
diff --git a/kernel/sched_pfair.c b/kernel/sched_pfair.c
index 4fa6ba2a8f..c0c6614eb7 100644
--- a/kernel/sched_pfair.c
+++ b/kernel/sched_pfair.c
@@ -495,7 +495,6 @@ sched_plugin_t* __init init_pfair_plugin(void)
 {
         int i=0;
         if (!s_plugin.ready_to_use) {
-                set_sched_options(SCHED_NONE);
                 pfair_domain_init(&pfair);
                 for (i=0; i<NR_CPUS; i++) {
                         sync_go[i] = 0;
diff --git a/kernel/sched_psn_edf.c b/kernel/sched_psn_edf.c
index 174cfea02c..2f683aa683 100644
--- a/kernel/sched_psn_edf.c
+++ b/kernel/sched_psn_edf.c
@@ -538,7 +538,6 @@ sched_plugin_t *__init init_psn_edf_plugin(void)
 
         if (!s_plugin.ready_to_use)
         {
-                set_sched_options(SCHED_NONE);
                 for (i = 0; i < NR_CPUS; i++)
                 {
                         psnedf_domain_init(remote_pedf(i),