scheduler_tick patched up

1 files changed, 20 insertions, 7 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index eddcab8877..baaa7b1399 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3037,7 +3037,7 @@ static inline void idle_balance(int cpu, struct rq *rq)
 static inline void wake_priority_sleeper(struct rq *rq)
 {
 #ifdef CONFIG_SCHED_SMT
-        if (!rq->nr_running)
+        if (!rq->nr_running || get_rt_mode() == MODE_RT_RUN)
                 return;
 
         spin_lock(&rq->lock);
@@ -3267,14 +3267,27 @@ void scheduler_tick(void)
 
         update_cpu_clock(p, rq, now);
 
-        if (p == rq->idle)
-                /* Task on the idle queue */
-                wake_priority_sleeper(rq);
-        else
-                task_running_tick(rq, p);
+        /* check whether the RT scheduler plugin requires a call to 
+         * schedule
+         */
+        if (curr_sched_plugin->scheduler_tick() == FORCE_RESCHED)
+                set_tsk_need_resched(p);
+
+        /* real-time accounting is done by the plugin
+         * call linux functions only for background tasks
+         */
+        if (!is_realtime(p)) {
+                if (p == rq->idle)
+                        /* Task on the idle queue */
+                        wake_priority_sleeper(rq);
+                else
+                        task_running_tick(rq, p);
+        }
+
 #ifdef CONFIG_SMP
         update_load(rq);
-        if (time_after_eq(jiffies, rq->next_balance))
+        if (time_after_eq(jiffies, rq->next_balance) && 
+            get_rt_mode() == MODE_NON_RT)
                 raise_softirq(SCHED_SOFTIRQ);
 #endif
 }