summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2026-06-29 09:26:20 -0700
committerAndrew Morton <akpm@linux-foundation.org>2026-07-05 16:23:07 -0700
commit06d14352e594d9adb14b78b93e3e2af00c4af847 (patch)
treee3a7401730817caaf2bd15e0e41264922d8f0791
parentfce184196427ae140aa99764f5f80a2ffa362181 (diff)
downloadlinux-next-06d14352e594d9adb14b78b93e3e2af00c4af847.tar.gz
linux-next-06d14352e594d9adb14b78b93e3e2af00c4af847.zip
mm-annotate-data-race-in-cpu_needs_drain-fix
reindent cpu_needs_drain, per David & Lorenzo Cc: Axel Rasmussen <axelrasmussen@google.com> Cc: Baoquan He <baoquan.he@linux.dev> Cc: Barry Song <baohua@kernel.org> Cc: Chris Li <chrisl@kernel.org> Cc: David Hildenbrand (Arm) <david@kernel.org> Cc: Jann Horn <jannh@google.com> Cc: Kairui Song <kasong@tencent.com> Cc: Kemeng Shi <shikemeng@huaweicloud.com> Cc: Liam R. Howlett <liam@infradead.org> Cc: Lorenzo Stoakes <ljs@kernel.org> Cc: Nhat Pham <nphamcs@gmail.com> Cc: Pedro Falcato <pfalcato@suse.de> Cc: Shakeel Butt <shakeel.butt@linux.dev> Cc: Vlastimil Babka <vbabka@kernel.org> Cc: Wei Xu <weixugc@google.com> Cc: Xuewen Wang <wangxuewen@kylinos.cn> Cc: Yuanchu Xie <yuanchu@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/swap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/swap.c b/mm/swap.c
index 0132ed0fb76b..58e4eff698cc 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -832,12 +832,12 @@ static bool cpu_needs_drain(unsigned int cpu)
/* Check these in order of likelihood that they're not zero */
return data_race(folio_batch_count(&fbatches->lru_add) ||
- folio_batch_count(&fbatches->lru_move_tail) ||
- folio_batch_count(&fbatches->lru_deactivate_file) ||
- folio_batch_count(&fbatches->lru_deactivate) ||
- folio_batch_count(&fbatches->lru_lazyfree) ||
- folio_batch_count(&fbatches->lru_activate) ||
- need_mlock_drain(cpu)) ||
+ folio_batch_count(&fbatches->lru_move_tail) ||
+ folio_batch_count(&fbatches->lru_deactivate_file) ||
+ folio_batch_count(&fbatches->lru_deactivate) ||
+ folio_batch_count(&fbatches->lru_lazyfree) ||
+ folio_batch_count(&fbatches->lru_activate) ||
+ need_mlock_drain(cpu)) ||
has_bh_in_lru(cpu, NULL);
}