The following commit has been merged into the sched/core branch of tip: Commit-ID: 17c891ab349138e8d8a59ca2700f42ce8af96f4e Gitweb: https://git.kernel.org/tip/17c891ab349138e8d8a59ca2700f42ce8af96f4e Author: Muchun Song <songmuchun@xxxxxxxxxxxxx> AuthorDate: Tue, 21 Apr 2020 22:41:23 +08:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Thu, 30 Apr 2020 20:14:41 +02:00 sched/fair: Use __this_cpu_read() in wake_wide() The code is executed with preemption(and interrupts) disabled, so it's safe to use __this_cpu_write(). Signed-off-by: Muchun Song <songmuchun@xxxxxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200421144123.33580-1-songmuchun@xxxxxxxxxxxxx --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index cd7fd7e..46b7bd4 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5718,7 +5718,7 @@ static int wake_wide(struct task_struct *p) { unsigned int master = current->wakee_flips; unsigned int slave = p->wakee_flips; - int factor = this_cpu_read(sd_llc_size); + int factor = __this_cpu_read(sd_llc_size); if (master < slave) swap(master, slave);