Commit ab28cb6e authored by Baoquan He's avatar Baoquan He Committed by Linus Torvalds
Browse files

mm: rename memmap_init() and memmap_init_zone() 

The current memmap_init_zone() only handles memory region inside one zone,
actually memmap_init() does the memmap init of one zone.  So rename both
of them accordingly.

Link: https://lkml.kernel.org/r/20210122135956.5946-3-bhe@redhat.com


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93f503c3

arch/ia64/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -536,18 +536,18 @@ virtual_memmap_init(u64 start, u64 end, void *arg) 
		    / sizeof(struct page));



	if (map_start < map_end)

		memmap_init_zone((unsigned long)(map_end - map_start),

		memmap_init_range((unsigned long)(map_end - map_start),

				 args->nid, args->zone, page_to_pfn(map_start), page_to_pfn(map_end),

				 MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);

	return 0;

}



void __meminit

memmap_init (unsigned long size, int nid, unsigned long zone,

memmap_init_zone(unsigned long size, int nid, unsigned long zone,

	     unsigned long start_pfn)

{

	if (!vmem_map) {

		memmap_init_zone(size, nid, zone, start_pfn, start_pfn + size,

		memmap_init_range(size, nid, zone, start_pfn, start_pfn + size,

				 MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);

	} else {

		struct page *start;

include/linux/mm.h

+2 −2
Original line number Diff line number Diff line
@@ -2405,10 +2405,10 @@ extern int __meminit early_pfn_to_nid(unsigned long pfn); 
#endif



extern void set_dma_reserve(unsigned long new_dma_reserve);

extern void memmap_init_zone(unsigned long, int, unsigned long,

extern void memmap_init_range(unsigned long, int, unsigned long,

		unsigned long, unsigned long, enum meminit_context,

		struct vmem_altmap *, int migratetype);

extern void memmap_init(unsigned long size, int nid,

extern void memmap_init_zone(unsigned long size, int nid,

		unsigned long zone, unsigned long range_start_pfn);

extern void setup_per_zone_wmarks(void);

extern int __meminit init_per_zone_wmark_min(void);

mm/memory_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, 
	 * expects the zone spans the pfn range. All the pages in the range

	 * are reserved so nobody should be touching them so we should be safe

	 */

	memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, 0,

	memmap_init_range(nr_pages, nid, zone_idx(zone), start_pfn, 0,

			 MEMINIT_HOTPLUG, altmap, migratetype);



	set_zone_contiguous(zone);

mm/page_alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -6121,7 +6121,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn) 
 * (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related

 * zone stats (e.g., nr_isolate_pageblock) are touched.

 */

void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,

void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone,

		unsigned long start_pfn, unsigned long zone_end_pfn,

		enum meminit_context context,

		struct vmem_altmap *altmap, int migratetype)
@@ -6258,7 +6258,7 @@ static void __meminit zone_init_free_lists(struct zone *zone) 
	}

}



void __meminit __weak memmap_init(unsigned long size, int nid,

void __meminit __weak memmap_init_zone(unsigned long size, int nid,

				  unsigned long zone,

				  unsigned long range_start_pfn)

{
@@ -6272,7 +6272,7 @@ void __meminit __weak memmap_init(unsigned long size, int nid, 


		if (end_pfn > start_pfn) {

			size = end_pfn - start_pfn;

			memmap_init_zone(size, nid, zone, start_pfn, range_end_pfn,

			memmap_init_range(size, nid, zone, start_pfn, range_end_pfn,

					 MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);

		}

	}
@@ -6982,7 +6982,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) 
		set_pageblock_order();

		setup_usemap(pgdat, zone, zone_start_pfn, size);

		init_currently_empty_zone(zone, zone_start_pfn, size);

		memmap_init(size, nid, j, zone_start_pfn);

		memmap_init_zone(size, nid, j, zone_start_pfn);

	}

}