The patch titled Subject: mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix has been added to the -mm mm-unstable branch. Its filename is mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix Date: Tue Jun 18 02:06:07 PM PDT 2024 comment fixes, per David and akpm Cc: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> Cc: Barry Song <v-songbaohua@xxxxxxxx> Cc: Chris Li <chrisl@xxxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: "Huang, Ying" <ying.huang@xxxxxxxxx> Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Ryan Roberts <ryan.roberts@xxxxxxx> Cc: Shuai Yuan <yuanshuai@xxxxxxxx> Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx> Cc: Yang Shi <shy828301@xxxxxxxxx> Cc: Yosry Ahmed <yosryahmed@xxxxxxxxxx> Cc: Yu Zhao <yuzhao@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory.c | 6 +++--- mm/swapfile.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) --- a/mm/memory.c~mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix +++ a/mm/memory.c @@ -4341,9 +4341,9 @@ check_folio: folio_add_lru_vma(folio, vma); } else if (!folio_test_anon(folio)) { /* - * We currently only expect small !anon folios, for which we now - * that they are either fully exclusive or fully shared. If we - * ever get large folios here, we have to be careful. + * We currently only expect small !anon folios, which are either + * fully exclusive or fully shared. If we ever get large folios + * here, we have to be careful. */ VM_WARN_ON_ONCE(folio_test_large(folio)); folio_add_new_anon_rmap(folio, vma, address, rmap_flags); --- a/mm/swapfile.c~mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix +++ a/mm/swapfile.c @@ -1917,9 +1917,9 @@ static int unuse_pte(struct vm_area_stru if (pte_swp_exclusive(old_pte)) rmap_flags |= RMAP_EXCLUSIVE; /* - * We currently only expect small !anon folios, for which we now that - * they are either fully exclusive or fully shared. If we ever get - * large folios here, we have to be careful. + * We currently only expect small !anon folios, which are either + * fully exclusive or fully shared. If we ever get large folios + * here, we have to be careful. */ if (!folio_test_anon(folio)) { VM_WARN_ON_ONCE(folio_test_large(folio)); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are writeback-factor-out-balance_wb_limits-to-remove-repeated-code-v3-fix.patch mm-shmem-add-multi-size-thp-sysfs-interface-for-anonymous-shmem-fix-fix.patch mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap-fix.patch mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix.patch