scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
John Blackwood (1):
sched: fix sched_rt_rq_enqueue() resched idle
Peter Zijlstra (1):
sched: rt-bandwidth accounting fix
kernel/sched_rt.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
kernel/sched_rt.c +7 -6
@@ -199,6 +199,8 @@ static inline struct rt_rq *group_rt_rq(struct sched_rt_entity *rt_se)static inline void sched_rt_rq_enqueue (struct rt_rq *rt_rq) { +if (rt_rq->rt_nr_running) +resched_task (rq_of_rt_rq (rt_rq)->curr); }static inline void sched_rt_rq_dequeue (struct rt_rq *rt_rq)
@@ -438,9 +440,6 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq) {u64 runtime =sched_rt_runtime (rt_rq); -if (runtime ==RUNTIME_INF ) -return 0 ; -if (rt_rq->rt_throttled)return rt_rq_throttled (rt_rq);
@@ -491,9 +490,11 @@ static void update_curr_rt(struct rq *rq) rt_rq =rt_rq_of_se (rt_se);spin_lock (&rt_rq->rt_runtime_lock); - rt_rq->rt_time += delta_exec; -if (sched_rt_runtime_exceeded (rt_rq)) -resched_task (curr); +if (sched_rt_runtime (rt_rq) !=RUNTIME_INF ) { + rt_rq->rt_time += delta_exec; +if (sched_rt_runtime_exceeded (rt_rq)) +resched_task (curr); + }spin_unlock (&rt_rq->rt_runtime_lock); } }