Since last commit removed the only external user of __init_page_from_nid(), this function is now only used locally within mm/mm_init.c under the CONFIG_DEFERRED_STRUCT_PAGE_INIT block.
Make __init_page_from_nid() static, move it inside the CONFIG_DEFERRED_STRUCT_PAGE_INIT block to clean up the code. 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 8232084f0c5e..a8acabcd1d93 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1755,7 +1755,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 7a710fcbe3c8..977a837b7ef6 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -686,10 +686,11 @@ static __meminit void pageblock_migratetype_init_range(unsigned long pfn, } } +#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; @@ -709,7 +710,6 @@ void __meminit __init_page_from_nid(unsigned long pfn, int nid) false); } -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT static inline void pgdat_set_deferred_range(pg_data_t *pgdat) { pgdat->first_deferred_pfn = ULONG_MAX; -- 2.20.1
