sched: Move sched_avg_update() to update_cpu_load()
PATCH 3/28 sched: Move sched_avg_update() to update_cpu_load()
Commit: da2b71edd8a7db44fe1746261410a981f3e03632 upstream
Author: Suresh Siddha <[email protected]>
AuthorDate: Mon Aug 23 13:42:51 2010 -0700
Currently sched_avg_update() (which updates rt_avg stats in the rq) is getting called from scale_rt_power() (in the load balance context) which doesn't take rq->lock.
Fix it by moving the sched_avg_update() to more appropriate update_cpu_load() where the CFS load gets updated as well.
Signed-off-by Suresh Siddha <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <1282596171.2694.3.camel@sbsiddha-MOBL3>
Signed-off-by Ingo Molnar <[email protected]>
Signed-off-by Mike Galbraith <[email protected]>
Acked-by Peter Zijlstra <[email protected]>
--- kernel/sched.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
kernel/sched.c +6 -2
@@ -1255,6 +1255,10 @@ static void resched_task(struct task_struct *p)static void sched_rt_avg_update (struct rq *rq,u64 rt_delta) { } + +static void sched_avg_update (struct rq *rq) +{ +}#endif /* CONFIG_SMP */ #if BITS_PER_LONG ==32
@@ -3102,6 +3106,8 @@ static void update_cpu_load(struct rq *this_rq) this_rq->calc_load_update +=LOAD_FREQ ;calc_load_account_active (this_rq); } + +sched_avg_update (this_rq); }#ifdef CONFIG_SMP
@@ -3653,8 +3659,6 @@ unsigned long scale_rt_power(int cpu)struct rq *rq =cpu_rq (cpu);u64 total, available; -sched_avg_update (rq); - total =sched_avg_period () + (rq->clock - rq->age_stamp); available = total - rq->rt_avg;
Signature · 1 line
1.7.4