Skip to contentSkip to conversation

mm-remove-set_compound_page_dtor.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 19, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: remove set_compound_page_dtor()
has been removed from the -mm tree. Its filename was
mm-remove-set_compound_page_dtor.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: Sidhartha Kumar <[email protected]>
Subject: mm: remove set_compound_page_dtor()
Date: Mon, 12 Jun 2023 09:34:05 -0700

All users can use the folio equivalent so this function can be safely removed.

---

 include/linux/mm.h |   10 ----------
 mm/huge_memory.c   |    2 +-
 mm/internal.h      |    2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-remove-set_compound_page_dtor +0 -10
@@ -1223,16 +1223,6 @@ enum compound_dtor_id {
 };
 extern compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS];
 
-static inline void set_compound_page_dtor(struct page *page,
-		enum compound_dtor_id compound_dtor)
-{
-	struct folio *folio = (struct folio *)page;
-
-	VM_BUG_ON_PAGE(compound_dtor >= NR_COMPOUND_DTORS, page);
-	VM_BUG_ON_PAGE(!PageHead(page), page);
-	folio->_folio_dtor = compound_dtor;
-}
-
 static inline void folio_set_compound_dtor(struct folio *folio,
 		enum compound_dtor_id compound_dtor)
 {
mm/huge_memory.c renamed from mm/huge_memory.c~mm-remove-set_compound_page_dtor +1 -1
@@ -583,7 +583,7 @@ void prep_transhuge_page(struct page *pa
 
 	VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio);
 	INIT_LIST_HEAD(&folio->_deferred_list);
-	set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR);
+	folio_set_compound_dtor(folio, TRANSHUGE_PAGE_DTOR);
 }
 
 static inline bool is_transparent_hugepage(struct page *page)
mm/internal.h renamed from mm/internal.h~mm-remove-set_compound_page_dtor +1 -1
@@ -391,7 +391,7 @@ static inline void prep_compound_head(st
 {
 	struct folio *folio = (struct folio *)page;
 
-	set_compound_page_dtor(page, COMPOUND_PAGE_DTOR);
+	folio_set_compound_dtor(folio, COMPOUND_PAGE_DTOR);
 	set_compound_order(page, order);
 	atomic_set(&folio->_entire_mapcount, -1);
 	atomic_set(&folio->_nr_pages_mapped, 0);

_

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