summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSidhartha Kumar <sidhartha.kumar@oracle.com>2023-06-12 09:34:05 -0700
committerAndrew Morton <akpm@linux-foundation.org>2023-06-19 16:19:19 -0700
commitb95826c9aa48b2997b3973b42a8716ba132b920e (patch)
treec13cf56710f7f0410f169efb2ea5084227ea7154
parenta92cbb82c8d375d47fbaf0e1ad3fd4074a7cb156 (diff)
mm: remove set_compound_page_dtor()
All users can use the folio equivalent so this function can be safely removed. Link: https://lkml.kernel.org/r/20230612163405.99345-1-sidhartha.kumar@oracle.com Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Tarun Sahu <tsahu@linux.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--include/linux/mm.h10
-rw-r--r--mm/huge_memory.c2
-rw-r--r--mm/internal.h2
3 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index a08dc8cc48fb..8f40bf17d597 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -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)
{
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 31bc8fa768e3..76f970aa5b4d 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -583,7 +583,7 @@ void prep_transhuge_page(struct page *page)
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)
diff --git a/mm/internal.h b/mm/internal.h
index faf0508d89a5..33b8b8f66af3 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -391,7 +391,7 @@ static inline void prep_compound_head(struct page *page, unsigned int order)
{
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);