diff --git a/[refs] b/[refs] index a374f4842afe..0f971a1fabcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1583715ddb61f822041807a0f18b3b4845e88c76 +refs/heads/master: af6d596fd603219b054c1c90fb16672a9fd441bd diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 700aa9a1413f..b7480fb5c3dc 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1453,7 +1453,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;