Merge branch 'sched/urgent' into sched/core

diff --git a/kernel/sched.c b/kernel/sched.c
index 338340a3fb89490bfc615d8c83a25119858dd1b3..3d1ee429219bdfc6cf4eb958a72b57bc5e99c3ce 100644 (file)
--- a/kernel/sched.c
+++ b/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;