From 3b908246e760605c2d2f56f6c92268ae1f28b351 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 28 Nov 2008 20:11:05 +0100 Subject: [PATCH] --- yaml --- r: 121335 b: refs/heads/master c: f1860c34b3ed829ac774647f266abf1074cd58cd h: refs/heads/master i: 121333: fa4f08eacc7010ba40b8bc8703451eee219e3a4f 121331: c63b3af0e1dd7422145147ef0827044d7f91da69 121327: 6ae45db1d27995823d3143aeb3050fda6816792b v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 07fe9f6883c4..f8cd29cddc72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64b7482de253c10efa2589a6212e3d2093a3efc7 +refs/heads/master: f1860c34b3ed829ac774647f266abf1074cd58cd diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 338340a3fb89..3d1ee429219b 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1433,9 +1433,10 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd); static unsigned long cpu_avg_load_per_task(int cpu) { struct rq *rq = cpu_rq(cpu); + unsigned long nr_running = rq->nr_running; - if (rq->nr_running) - rq->avg_load_per_task = rq->load.weight / rq->nr_running; + if (nr_running) + rq->avg_load_per_task = rq->load.weight / nr_running; else rq->avg_load_per_task = 0;