Merge with qemu branch

10 files changed, 9 insertions, 18 deletions

diff --git a/include/linux/sched_plugin.h b/include/linux/sched_plugin.h
index 61080d2a73..fa0716f0eb 100644
--- a/include/linux/sched_plugin.h
+++ b/include/linux/sched_plugin.h
@@ -110,7 +110,6 @@ struct sched_plugin {
 
         /*      scheduler invocation    */
         scheduler_tick_t        scheduler_tick;
-        scheduler_tick_t        algo_scheduler_tick;
         schedule_t              schedule;       
         finish_switch_t         finish_switch;
 
diff --git a/kernel/litmus.c b/kernel/litmus.c
index 770f67af8f..4457d52e0f 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -346,7 +346,7 @@ reschedule_check_t  __sched rt_scheduler_tick(void)
          *      It is the plugin's tick handler' job to detect quantum
          *      boundaries in pfair.
          */
-        return curr_sched_plugin->algo_scheduler_tick();
+        return curr_sched_plugin->scheduler_tick();
 }
 
 asmlinkage spolicy sys_sched_setpolicy(spolicy newpolicy)
diff --git a/kernel/sched.c b/kernel/sched.c
index 8eba9b61cd..154d78e5d1 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3285,7 +3285,7 @@ void scheduler_tick(void)
          * schedule
          */
         TS_PLUGIN_TICK_START;
-        if (curr_sched_plugin->scheduler_tick() == FORCE_RESCHED)
+        if (rt_scheduler_tick() == FORCE_RESCHED)
                 set_tsk_need_resched(p);
         TS_PLUGIN_TICK_END;
 
diff --git a/kernel/sched_edf_hsb.c b/kernel/sched_edf_hsb.c
index b53a277658..075d61c024 100644
--- a/kernel/sched_edf_hsb.c
+++ b/kernel/sched_edf_hsb.c
@@ -1766,8 +1766,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
 #define INIT_SCHED_PLUGIN (struct sched_plugin){\
         .plugin_name            = "EDF-HSB",\
         .ready_to_use           = 1,\
-        .algo_scheduler_tick    = hsb_scheduler_tick,\
-        .scheduler_tick         = rt_scheduler_tick,\
+        .scheduler_tick         = hsb_scheduler_tick,\
         .prepare_task           = hsb_prepare_task,\
         .sleep_next_period      = edf_sleep_next_period,\
         .tear_down              = hsb_tear_down,\
diff --git a/kernel/sched_global_edf.c b/kernel/sched_global_edf.c
index b00674a5c4..6e3928b7df 100644
--- a/kernel/sched_global_edf.c
+++ b/kernel/sched_global_edf.c
@@ -429,8 +429,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
 #define INIT_SCHED_PLUGIN (struct sched_plugin){\
         .plugin_name            = "Global EDF",\
         .ready_to_use           = 1,\
-        .algo_scheduler_tick    = gedf_scheduler_tick,\
-        .scheduler_tick         = rt_scheduler_tick,\
+        .scheduler_tick         = gedf_scheduler_tick,\
         .prepare_task           = gedf_prepare_task,\
         .sleep_next_period      = edf_sleep_next_period,\
         .tear_down              = gedf_tear_down,\
@@ -535,8 +534,7 @@ static int gedf_np_check_resched(rt_domain_t *edf)
 #define INIT_SCHED_PLUGIN_NP (struct sched_plugin){\
         .plugin_name            = "Non-Preemptive Global EDF",\
         .ready_to_use           = 1,\
-        .algo_scheduler_tick    = gedf_np_scheduler_tick,\
-        .scheduler_tick         = rt_scheduler_tick,\
+        .scheduler_tick         = gedf_np_scheduler_tick,\
         .prepare_task           = gedf_prepare_task,\
         .sleep_next_period      = edf_sleep_next_period,\
         .tear_down              = gedf_tear_down,\
diff --git a/kernel/sched_gsn_edf.c b/kernel/sched_gsn_edf.c
index 2dae550f29..27d1b37b41 100644
--- a/kernel/sched_gsn_edf.c
+++ b/kernel/sched_gsn_edf.c
@@ -773,8 +773,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
 #define INIT_SCHED_PLUGIN (struct sched_plugin){                \
         .plugin_name            = "GSN-EDF",                    \
         .ready_to_use           = 1,                            \
-        .algo_scheduler_tick    = gsnedf_scheduler_tick,        \
-        .scheduler_tick         = rt_scheduler_tick,            \
+        .scheduler_tick         = gsnedf_scheduler_tick,        \
         .prepare_task           = gsnedf_prepare_task,          \
         .sleep_next_period      = edf_sleep_next_period,        \
         .tear_down              = gsnedf_tear_down,             \
diff --git a/kernel/sched_part_edf.c b/kernel/sched_part_edf.c
index 57e22d3d68..8166c8f4c6 100644
--- a/kernel/sched_part_edf.c
+++ b/kernel/sched_part_edf.c
@@ -309,8 +309,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
 #define INIT_SCHED_PLUGIN (struct sched_plugin) {\
         .plugin_name            = "Partitioned EDF",\
         .ready_to_use           = 1,\
-        .algo_scheduler_tick    = part_edf_scheduler_tick,\
-        .scheduler_tick         = rt_scheduler_tick,\
+        .scheduler_tick         = part_edf_scheduler_tick,\
         .prepare_task           = part_edf_prepare_task,\
         .sleep_next_period      = edf_sleep_next_period,\
         .tear_down              = part_edf_tear_down,\
diff --git a/kernel/sched_pfair.c b/kernel/sched_pfair.c
index c0c6614eb7..20a7526a0a 100644
--- a/kernel/sched_pfair.c
+++ b/kernel/sched_pfair.c
@@ -478,8 +478,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
 #define INIT_PFAIR_PLUGIN (struct sched_plugin){\
         .plugin_name            = "PFAIR",\
         .ready_to_use           = 1,\
-        .algo_scheduler_tick    = pfair_scheduler_tick,\
-        .scheduler_tick         = rt_scheduler_tick,\
+        .scheduler_tick         = pfair_scheduler_tick,\
         .prepare_task           = pfair_prepare_task,\
         .sleep_next_period      = 0,\
         .tear_down              = pfair_tear_down,\
diff --git a/kernel/sched_plugin.c b/kernel/sched_plugin.c
index 10af80bd2a..3c7d6c0842 100644
--- a/kernel/sched_plugin.c
+++ b/kernel/sched_plugin.c
@@ -93,7 +93,6 @@ long litmus_dummy_pi_block(struct pi_semaphore *sem,
 sched_plugin_t linux_sched_plugin = {
         .plugin_name = "Linux",
         .ready_to_use = 1,
-        .algo_scheduler_tick = 0,
         .scheduler_tick = litmus_dummy_scheduler_tick,
         .prepare_task = litmus_dummy_prepare_task,      
         .tear_down = litmus_dummy_tear_down,    
diff --git a/kernel/sched_psn_edf.c b/kernel/sched_psn_edf.c
index 2f683aa683..32f9b23829 100644
--- a/kernel/sched_psn_edf.c
+++ b/kernel/sched_psn_edf.c
@@ -516,8 +516,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
 #define INIT_SCHED_PLUGIN (struct sched_plugin) {\
         .plugin_name            = "PSN-EDF",\
         .ready_to_use           = 1,\
-        .algo_scheduler_tick    = psnedf_scheduler_tick,\
-        .scheduler_tick         = rt_scheduler_tick,\
+        .scheduler_tick         = psnedf_scheduler_tick,\
         .prepare_task           = psnedf_prepare_task,\
         .sleep_next_period      = edf_sleep_next_period,\
         .tear_down              = psnedf_tear_down,\