Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mm: pass the vmem_altmap to vmemmap_populate 



We can just pass this on instead of having to do a radix tree lookup
without proper locking a few levels into the callchain.

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

arch/arm64/mm/mmu.c

+4 −2
Original line number Diff line number Diff line
@@ -654,12 +654,14 @@ int kern_addr_valid(unsigned long addr) 
}

#ifdef CONFIG_SPARSEMEM_VMEMMAP

#if !ARM64_SWAPPER_USES_SECTION_MAPS

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

		struct vmem_altmap *altmap)

{

	return vmemmap_populate_basepages(start, end, node);

}

#else	/* !ARM64_SWAPPER_USES_SECTION_MAPS */

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

		struct vmem_altmap *altmap)

{

	unsigned long addr = start;

	unsigned long next;

arch/ia64/mm/discontig.c

+2 −1
Original line number Diff line number Diff line
@@ -754,7 +754,8 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat) 
#endif



#ifdef CONFIG_SPARSEMEM_VMEMMAP

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

		struct vmem_altmap *altmap)

{

	return vmemmap_populate_basepages(start, end, node);

}

arch/powerpc/mm/init_64.c

+2 −5
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ static __meminit void vmemmap_list_populate(unsigned long phys, 
	vmemmap_list = vmem_back;

}



int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

		struct vmem_altmap *altmap)

{

	unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
@@ -193,16 +194,12 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) 
	pr_debug("vmemmap_populate %lx..%lx, node %d\n", start, end, node);



	for (; start < end; start += page_size) {

		struct vmem_altmap *altmap;

		void *p;

		int rc;



		if (vmemmap_populated(start, page_size))

			continue;



		/* altmap lookups only work at section boundaries */

		altmap = to_vmem_altmap(SECTION_ALIGN_DOWN(start));



		p =  __vmemmap_alloc_block_buf(page_size, node, altmap);

		if (!p)

			return -ENOMEM;

arch/s390/mm/vmem.c

+2 −1
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ static void vmem_remove_range(unsigned long start, unsigned long size) 
/*

 * Add a backed mem_map array to the virtual mem_map array.

 */

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

		struct vmem_altmap *altmap)

{

	unsigned long pgt_prot, sgt_prot;

	unsigned long address = start;

arch/sparc/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -2628,7 +2628,7 @@ EXPORT_SYMBOL(_PAGE_CACHE); 


#ifdef CONFIG_SPARSEMEM_VMEMMAP

int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,

			       int node)

			       int node, struct vmem_altmap *altmap)

{

	unsigned long pte_base;