Skip to contentSkip to conversation

mm-mm_init-initialize-page-_mapcount-directly-in-__init_single_page.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 29, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled

     Subject: mm/mm_init: initialize page->_mapcount directly in __init_single_page()

has been removed from the -mm tree. Its filename was
mm-mm_init-initialize-page-_mapcount-directly-in-__init_single_page.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/mm_init: initialize page->_mapcount directly in __init_single_page()
Date: Wed, 29 May 2024 13:19:04 +0200

Let's simply reinitialize the page->_mapcount directly. We can now get rid of page_mapcount_reset().

---

 include/linux/mm.h |    5 -----
 mm/mm_init.c       |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-mm_init-initialize-page-_mapcount-directly-in-__init_single_page +0 -5
@@ -1210,11 +1210,6 @@ static inline int folio_entire_mapcount(
 	return atomic_read(&folio->_entire_mapcount) + 1;
 }
 
-static inline void page_mapcount_reset(struct page *page)
-{
-	atomic_set(&(page)->_mapcount, -1);
-}
-
 static inline int folio_large_mapcount(const struct folio *folio)
 {
 	VM_WARN_ON_FOLIO(!folio_test_large(folio), folio);
mm/mm_init.c renamed from mm/mm_init.c~mm-mm_init-initialize-page-_mapcount-directly-in-__init_single_page +1 -1
@@ -569,7 +569,7 @@ void __meminit __init_single_page(struct
 	mm_zero_struct_page(page);
 	set_page_links(page, zone, nid, pfn);
 	init_page_count(page);
-	page_mapcount_reset(page);
+	atomic_set(&page->_mapcount, -1);
 	page_cpupid_reset_last(page);
 	page_kasan_tag_reset(page);
 

_

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