mm-rmap-remove-page_add_anon_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: remove page_add_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-remove-page_add_anon_rmap.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/rmap: remove page_add_anon_rmap()
Date: Wed, 20 Dec 2023 23:44:45 +0100
All users are gone, remove it and all traces.
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]>
---
include/linux/rmap.h | 2 -- mm/rmap.c | 31 ++++--------------------------- 2 files changed, 4 insertions(+), 29 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-remove-page_add_anon_rmap +0 -2
@@ -239,8 +239,6 @@ void folio_add_anon_rmap_ptes(struct fol folio_add_anon_rmap_ptes(folio, page, 1, vma, address, flags)void folio_add_anon_rmap_pmd (struct folio *,struct page *,struct vm_area_struct *,unsigned long address,rmap_t flags); -void page_add_anon_rmap (struct page *,struct vm_area_struct *, -unsigned long address,rmap_t flags);void folio_add_new_anon_rmap (struct folio *,struct vm_area_struct *,unsigned long address); void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages,
mm/rmap.c renamed from mm/rmap.c~mm-rmap-remove-page_add_anon_rmap +4 -27
@@ -1270,7 +1270,7 @@ static void __page_check_anon_rmap(struc* The page's anon-rmap details (mapping and index) are guaranteed to * be set up correctly at this point. * -* We have exclusion against page_add_anon_rmap because the caller +* We have exclusion against folio_add_anon_rmap_*() because the caller * always holds the page locked. * * We have exclusion against folio_add_new_anon_rmap because those pages
@@ -1283,29 +1283,6 @@ static void __page_check_anon_rmap(struc page); } -/** -* page_add_anon_rmap - add pte mapping to an anonymous page -* @page: the page to add the mapping to -* @vma: the vm area in which the mapping is added -* @address: the user virtual address mapped -* @flags: the rmap flags -* -* The caller needs to hold the pte lock, and the page must be locked in -* the anon_vma case: to serialize mapping,index checking after setting, -* and to ensure that PageAnon is not being upgraded racily to PageKsm -* (but PageKsm is never downgraded to PageAnon). -*/ -void page_add_anon_rmap (struct page *page,struct vm_area_struct *vma, -unsigned long address,rmap_t flags) -{ -struct folio *folio =page_folio (page); - -if (likely (!(flags &RMAP_COMPOUND ))) -folio_add_anon_rmap_pte (folio, page, vma, address, flags); -else -folio_add_anon_rmap_pmd (folio, page, vma, address, flags); -} - static __always_inline void __folio_add_anon_rmap(struct folio *folio,struct page *page,int nr_pages,struct vm_area_struct *vma,unsigned long address,rmap_t flags,enum rmap_level level)
@@ -1419,7 +1396,7 @@ void folio_add_anon_rmap_pmd(struct foli* @vma: the vm area in which the mapping is added * @address: the user virtual address mapped * -* Like page_add_anon_rmap() but must only be called on *new* folios. +* Like folio_add_anon_rmap_*() but must only be called on *new* folios. * This means the inc-and-test can be bypassed. * The folio does not have to be locked. *
@@ -1479,7 +1456,7 @@ static __always_inline void __folio_add_if (nr)__lruvec_stat_mod_folio (folio,NR_FILE_MAPPED , nr); -/* See comments in page_add_anon_rmap() */ +/* See comments in folio_add_anon_rmap_*() */ if (!folio_test_large (folio))mlock_vma_folio (folio, vma); }
@@ -1593,7 +1570,7 @@ void page_remove_rmap(struct page *page,/* * It would be tidy to reset folio_test_anon mapping when fully -* unmapped, but that might overwrite a racing page_add_anon_rmap +* unmapped, but that might overwrite a racing folio_add_anon_rmap_*() * which increments mapcount after us but sets mapping before us: * so leave the reset to free_pages_prepare, and remember that * it's only reliable while mapped.
_
Patches currently in -mm which might be from [email protected] are