Skip to contentSkip to conversation

mm-userfaultfd-page_add_file_rmap-folio_add_file_rmap_pte.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Dec 29, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled

     Subject: mm/userfaultfd: page_add_file_rmap() -> folio_add_file_rmap_pte()

has been removed from the -mm tree. Its filename was
mm-userfaultfd-page_add_file_rmap-folio_add_file_rmap_pte.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/userfaultfd: page_add_file_rmap() -> folio_add_file_rmap_pte()
Date: Wed, 20 Dec 2023 23:44:35 +0100

Let's convert mfill_atomic_install_pte().

---

 mm/userfaultfd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/userfaultfd.c renamed from mm/userfaultfd.c~mm-userfaultfd-page_add_file_rmap-folio_add_file_rmap_pte +1 -1
@@ -114,7 +114,7 @@ int mfill_atomic_install_pte(pmd_t *dst_
 		/* Usually, cache pages are already added to LRU */
 		if (newly_allocated)
 			folio_add_lru(folio);
-		page_add_file_rmap(page, dst_vma, false);
+		folio_add_file_rmap_pte(folio, page, dst_vma);
 	} else {
 		folio_add_new_anon_rmap(folio, dst_vma, dst_addr);
 		folio_add_lru_vma(folio, dst_vma);

_

Patches currently in -mm which might be from [email protected] are