Commit a99583e7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dan Williams
Browse files

mm: pass the vmem_altmap to memmap_init_zone 



Pass the vmem_altmap two levels down instead of needing a lookup.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 24b6d416

arch/ia64/mm/init.c

+5 −4
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ virtual_memmap_init(u64 start, u64 end, void *arg) 
	if (map_start < map_end)

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

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

				 MEMMAP_EARLY);

				 MEMMAP_EARLY, NULL);

	return 0;

}
@@ -509,9 +509,10 @@ void __meminit 
memmap_init (unsigned long size, int nid, unsigned long zone,

	     unsigned long start_pfn)

{

	if (!vmem_map)

		memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY);

	else {

	if (!vmem_map) {

		memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY,

				NULL);

	} else {

		struct page *start;

		struct memmap_init_callback_data args;

include/linux/memory_hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ extern int add_memory_resource(int nid, struct resource *resource, bool online); 
extern int arch_add_memory(int nid, u64 start, u64 size,

		struct vmem_altmap *altmap, bool want_memblock);

extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,

		unsigned long nr_pages);

		unsigned long nr_pages, struct vmem_altmap *altmap);

extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);

extern bool is_memblock_offlined(struct memory_block *mem);

extern void remove_memory(int nid, u64 start, u64 size);

include/linux/mm.h

+2 −2
Original line number Diff line number Diff line
@@ -2069,8 +2069,8 @@ static inline void zero_resv_unavail(void) {} 
#endif



extern void set_dma_reserve(unsigned long new_dma_reserve);

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

				unsigned long, enum memmap_context);

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

		enum memmap_context, struct vmem_altmap *);

extern void setup_per_zone_wmarks(void);

extern int __meminit init_per_zone_wmark_min(void);

extern void mem_init(void);

kernel/memremap.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, 
	if (!error)

		move_pfn_range_to_zone(&NODE_DATA(nid)->node_zones[ZONE_DEVICE],

					align_start >> PAGE_SHIFT,

					align_size >> PAGE_SHIFT);

					align_size >> PAGE_SHIFT, altmap);

	mem_hotplug_done();

	if (error)

		goto err_add_memory;

mm/hmm.c

+1 −1
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ static int hmm_devmem_pages_create(struct hmm_devmem *devmem) 
	}

	move_pfn_range_to_zone(&NODE_DATA(nid)->node_zones[ZONE_DEVICE],

				align_start >> PAGE_SHIFT,

				align_size >> PAGE_SHIFT);

				align_size >> PAGE_SHIFT, NULL);

	mem_hotplug_done();



	for (pfn = devmem->pfn_first; pfn < devmem->pfn_last; pfn++) {