The quilt patch titled
Subject: mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix
has been removed from the -mm tree. Its filename was
mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix.patch
This patch was dropped because it was folded into mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false.patch
------------------------------------------------------
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
@@ -4343,9 +4343,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
mm-huge_memoryc-fix-used-uninitialized.patch
mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false.patch
mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v7-fix.patch
tools-mm-introduce-a-tool-to-assess-swap-entry-allocation-for-thp_swapout-fix.patch
mm-gup-introduce-memfd_pin_folios-for-pinning-memfd-folios-fix.patch
