mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

mm: rename memmap_init() and memmap_init_zone()

Browse source 
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: Baoquan He <bhe@redhat.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Baoquan He 2021-02-24 12:06:14 -08:00 committed by Linus Torvalds
parent 93f503c3fc
commit ab28cb6e1e
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/ia64/mm/init.c
View file

@ -536,18 +536,18 @@ virtual_memmap_init(u64 start, u64 end, void *arg)
/ sizeof(struct page)); / sizeof(struct page));
if (map_start < map_end) 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), args->nid, args->zone, page_to_pfn(map_start), page_to_pfn(map_end),
MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
return 0; return 0;
} }
void __meminit 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) unsigned long start_pfn)
{ {
if (!vmem_map) { 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); MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
} else { } else {
struct page *start; struct page *start;

4
include/linux/mm.h
View file

@ -2405,10 +2405,10 @@ extern int __meminit early_pfn_to_nid(unsigned long pfn);
#endif #endif
extern void set_dma_reserve(unsigned long new_dma_reserve); 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, unsigned long, unsigned long, enum meminit_context,
struct vmem_altmap *, int migratetype); 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); unsigned long zone, unsigned long range_start_pfn);
extern void setup_per_zone_wmarks(void); extern void setup_per_zone_wmarks(void);
extern int __meminit init_per_zone_wmark_min(void); extern int __meminit init_per_zone_wmark_min(void);

2
mm/memory_hotplug.c
View file

@ -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 * 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 * 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); MEMINIT_HOTPLUG, altmap, migratetype);
set_zone_contiguous(zone); set_zone_contiguous(zone);

8
mm/page_alloc.c
View file

@ -6121,7 +6121,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn)
* (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related * (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related
* zone stats (e.g., nr_isolate_pageblock) are touched. * 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, unsigned long start_pfn, unsigned long zone_end_pfn,
enum meminit_context context, enum meminit_context context,
struct vmem_altmap *altmap, int migratetype) 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 zone,
unsigned long range_start_pfn) unsigned long range_start_pfn)
{ {
@ -6272,7 +6272,7 @@ void __meminit __weak memmap_init(unsigned long size, int nid,
if (end_pfn > start_pfn) { if (end_pfn > start_pfn) {
size = 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); MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
} }
} }
@ -6982,7 +6982,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)
set_pageblock_order(); set_pageblock_order();
setup_usemap(pgdat, zone, zone_start_pfn, size); setup_usemap(pgdat, zone, zone_start_pfn, size);
init_currently_empty_zone(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);
} }
} }