mm-ksm-page_add_anon_rmap-folio_add_anon_rmap_pte.patch removed from -mm tree
The quilt patch titled
Subject: mm/ksm: page_add_anon_rmap() -> folio_add_anon_rmap_pte()
has been removed from the -mm tree. Its filename was
mm-ksm-page_add_anon_rmap-folio_add_anon_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/ksm: page_add_anon_rmap() -> folio_add_anon_rmap_pte()
Date: Wed, 20 Dec 2023 23:44:42 +0100
Let's convert replace_page(). While at it, perform some folio conversion.
Signed-off-by David Hildenbrand <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Muchun Song <[email protected]>
Cc Muchun Song <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Yin Fengwei <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/ksm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
mm/ksm.c renamed from mm/ksm.c~mm-ksm-page_add_anon_rmap-folio_add_anon_rmap_pte +5 -3
@@ -1369,6 +1369,7 @@ out:static int replace_page (struct vm_area_struct *vma,struct page *page,struct page *kpage,pte_t orig_pte) { +struct folio *kfolio =page_folio (kpage);struct mm_struct *mm = vma->vm_mm;struct folio *folio;pmd_t *pmd;
@@ -1408,15 +1409,16 @@ static int replace_page(struct vm_area_s goto out_mn; }VM_BUG_ON_PAGE (PageAnonExclusive (page), page); -VM_BUG_ON_PAGE (PageAnon (kpage) &&PageAnonExclusive (kpage), kpage); +VM_BUG_ON_FOLIO (folio_test_anon (kfolio) &&PageAnonExclusive (kpage), + kfolio);/* * No need to check ksm_use_zero_pages here: we can only have a * zero_page here if ksm_use_zero_pages was enabled already. */ if (!is_zero_pfn (page_to_pfn (kpage))) { -get_page (kpage); -page_add_anon_rmap (kpage, vma, addr,RMAP_NONE ); +folio_get (kfolio); +folio_add_anon_rmap_pte (kfolio, kpage, vma, addr,RMAP_NONE ); newpte =mk_pte (kpage, vma->vm_page_prot); }else {/*
_
Patches currently in -mm which might be from [email protected] are