diff options
| -rw-r--r-- | mm/hugetlb.c | 2 | ||||
| -rw-r--r-- | mm/internal.h | 2 | ||||
| -rw-r--r-- | mm/mm_init.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index af9b8c1fca67..6fccfe6d046c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3407,7 +3407,7 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, while (npages--) { pfn = page_to_pfn(page); - __init_reserved_page_zone(pfn, nid); + __init_page_from_nid(pfn, nid); free_reserved_page(page); page++; } diff --git a/mm/internal.h b/mm/internal.h index 286520a424fe..21f2643f3d95 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1518,7 +1518,7 @@ 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_reserved_page_zone(unsigned long pfn, 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 c82b0162f1cb..16a96aaf65c4 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -668,7 +668,7 @@ static inline void fixup_hashdist(void) {} /* * Initialize a reserved page unconditionally, finding its zone first. */ -void __meminit __init_reserved_page_zone(unsigned long pfn, int nid) +void __meminit __init_page_from_nid(unsigned long pfn, int nid) { pg_data_t *pgdat; int zid; @@ -748,7 +748,7 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid) if (early_page_initialised(pfn, nid)) return; - __init_reserved_page_zone(pfn, nid); + __init_page_from_nid(pfn, nid); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} |