Merge branch 'sched/urgent' into sched/core

[deliverable/linux.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 4c7388ef5be7c5c4a601a91d295f0bb55d13e350..152828239ef01fb6d16adf43ee7718bf41574bdc 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1443,7 +1443,7 @@ 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;
+       unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
 
        if (nr_running)
                rq->avg_load_per_task = rq->load.weight / nr_running;