litmus: rip out the concept of RT_MODE.

It also rips out scheduler_setup().
This patch is very invasive and only compile-tested.

2 files changed, 2 insertions, 23 deletions

diff --git a/include/linux/litmus.h b/include/linux/litmus.h
index 90ed164d4d..8f2a174fae 100644
--- a/include/linux/litmus.h
+++ b/include/linux/litmus.h
@@ -25,19 +25,12 @@ typedef enum {
 
 } sched_setup_cmd_t;
 
-/*      System-wide runtime modes */
-enum rt_mode_t {
-        MODE_NON_RT = 0,
-        MODE_RT_RUN = 1
-};
-
 /*      per-task modes */
 enum rt_task_mode_t {
         BACKGROUND_TASK = 0,
         LITMUS_RT_TASK  = 1
 };
 
-
 /*      Plugin boot options, for convenience */
 #define PLUGIN_LINUX            "linux"
 #define PLUGIN_GSN_EDF          "gsn_edf"
@@ -48,12 +41,6 @@ extern spolicy sched_policy;
 /*      RT mode start time      */
 extern volatile unsigned long rt_start_time;
 
-/*      Here we store the current mode of the system */
-extern atomic_t rt_mode;
-
-#define get_rt_mode() (atomic_read(&rt_mode))
-#define set_rt_mode(a) atomic_set(&rt_mode,(a))
-
 #define TRACE(fmt, args...) \
         sched_trace_log_message("%d: " fmt, raw_smp_processor_id(), ## args)
 
@@ -66,10 +53,10 @@ extern atomic_t rt_mode;
 #define TRACE_BUG_ON(cond) \
         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"\
+                             "flags=%x partition=%d cpu=%d rtflags=%d"\
                              " 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(), \
+        current->pid, current->state, current->flags,  \
         get_partition(current), smp_processor_id(), get_rt_flags(current), \
         current->rt_param.times.job_no, current->rt_param.kernel_np, \
         current->time_slice\
diff --git a/include/linux/sched_plugin.h b/include/linux/sched_plugin.h
index 30d3bd6b48..6bc2fc3788 100644
--- a/include/linux/sched_plugin.h
+++ b/include/linux/sched_plugin.h
@@ -86,18 +86,11 @@ typedef long (*pi_block_t) (struct pi_semaphore *sem, struct task_struct *t);
 /* This function causes the caller to sleep until the next release */
 typedef long (*sleep_next_period_t) (void);
 
-typedef int (*scheduler_setup_t) (int cmd, void __user *parameter);
-
-typedef int (*mode_change_t) (int);
-
 struct sched_plugin {
         struct list_head        list;
         /*      basic info              */
         char                    *plugin_name;   
 
-        /*      management interface    */
-        mode_change_t           mode_change;
-
         /*      scheduler invocation    */
         scheduler_tick_t        scheduler_tick;
         schedule_t              schedule;
@@ -105,7 +98,6 @@ struct sched_plugin {
 
         /*      syscall backend         */
         sleep_next_period_t     sleep_next_period;
-        scheduler_setup_t       scheduler_setup;
 
         /*      task state changes      */
         prepare_task_t          prepare_task;