On Sun, Apr 05, 2026 at 08:51:59PM +0800, Muchun Song wrote: > From: Chengkaitao <[email protected]> > > Since the vmemmap_p?d_populate functions are unused outside the mm > subsystem, we can remove their external declarations and convert > them to static functions.
I think this is already merged > Signed-off-by: Chengkaitao <[email protected]> > --- > include/linux/mm.h | 7 ------- > mm/sparse-vmemmap.c | 10 +++++----- > 2 files changed, 5 insertions(+), 12 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index bebc5f892f81..aa8c05de7585 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -4860,13 +4860,6 @@ unsigned long section_map_size(void); > struct page * __populate_section_memmap(unsigned long pfn, > unsigned long nr_pages, int nid, struct vmem_altmap *altmap, > struct dev_pagemap *pgmap); > -pgd_t *vmemmap_pgd_populate(unsigned long addr, int node); > -p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); > -pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); > -pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); > -pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, > - struct vmem_altmap *altmap, unsigned long ptpfn, > - unsigned long flags); > void *vmemmap_alloc_block(unsigned long size, int node); > struct vmem_altmap; > void *vmemmap_alloc_block_buf(unsigned long size, int node, > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index d3096de04cc6..0ee03db0b22f 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -151,7 +151,7 @@ void __meminit vmemmap_verify(pte_t *pte, int node, > start, end - 1); > } > > -pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int > node, > +static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long > addr, int node, > struct vmem_altmap *altmap, > unsigned long ptpfn, unsigned long flags) > { > @@ -195,7 +195,7 @@ static void * __meminit vmemmap_alloc_block_zero(unsigned > long size, int node) > return p; > } > > -pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int > node) > +static pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long > addr, int node) > { > pmd_t *pmd = pmd_offset(pud, addr); > if (pmd_none(*pmd)) { > @@ -208,7 +208,7 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, > unsigned long addr, int node) > return pmd; > } > > -pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int > node) > +static pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long > addr, int node) > { > pud_t *pud = pud_offset(p4d, addr); > if (pud_none(*pud)) { > @@ -221,7 +221,7 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, > unsigned long addr, int node) > return pud; > } > > -p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int > node) > +static p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long > addr, int node) > { > p4d_t *p4d = p4d_offset(pgd, addr); > if (p4d_none(*p4d)) { > @@ -234,7 +234,7 @@ p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, > unsigned long addr, int node) > return p4d; > } > > -pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) > +static pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) > { > pgd_t *pgd = pgd_offset_k(addr); > if (pgd_none(*pgd)) { > -- > 2.20.1 > -- Sincerely yours, Mike.
