__init_page_from_nid() no longer has external users and is only used locally in mm/mm_init.c under CONFIG_DEFERRED_STRUCT_PAGE_INIT.
Make it static and keep it inside that block. Signed-off-by: Muchun Song <[email protected]> --- mm/internal.h | 1 - mm/mm_init.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 6bd9aa37b952..4a5053368078 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1754,7 +1754,6 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte void __meminit __init_single_page(struct page *page, unsigned long pfn, unsigned long zone, int nid); -void __meminit __init_page_from_nid(unsigned long pfn, int nid); /* shrinker related functions */ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, diff --git a/mm/mm_init.c b/mm/mm_init.c index 165b83c9a9c3..c64e5d63c4ae 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -688,10 +688,11 @@ static __meminit void pageblock_migratetype_init_range(unsigned long pfn, } #endif +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT /* * Initialize a reserved page unconditionally, finding its zone first. */ -void __meminit __init_page_from_nid(unsigned long pfn, int nid) +static void __meminit __init_page_from_nid(unsigned long pfn, int nid) { pg_data_t *pgdat; int zid; @@ -713,7 +714,6 @@ void __meminit __init_page_from_nid(unsigned long pfn, int nid) } } -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT static inline void pgdat_set_deferred_range(pg_data_t *pgdat) { pgdat->first_deferred_pfn = ULONG_MAX; -- 2.54.0
