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;