Commit 29ab6c47 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/mm: Pass node id into create_section_mapping 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
[mpe: Move __map_kernel_page_nid() inside #ifdef SPARSEMEM_VMEMMAP]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2ad452ff

arch/powerpc/include/asm/book3s/64/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ extern int __meminit hash__vmemmap_create_mapping(unsigned long start, 
extern void hash__vmemmap_remove_mapping(unsigned long start,

				     unsigned long page_size);



int hash__create_section_mapping(unsigned long start, unsigned long end);

int hash__create_section_mapping(unsigned long start, unsigned long end, int nid);

int hash__remove_section_mapping(unsigned long start, unsigned long end);



#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/book3s/64/radix.h

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static inline unsigned long radix__get_tree_size(void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int radix__create_section_mapping(unsigned long start, unsigned long end);

int radix__create_section_mapping(unsigned long start, unsigned long end, int nid);

int radix__remove_section_mapping(unsigned long start, unsigned long end);

#endif /* CONFIG_MEMORY_HOTPLUG */

#endif /* __ASSEMBLY__ */

arch/powerpc/include/asm/sparsemem.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#endif /* CONFIG_SPARSEMEM */



#ifdef CONFIG_MEMORY_HOTPLUG

extern int create_section_mapping(unsigned long start, unsigned long end);

extern int create_section_mapping(unsigned long start, unsigned long end, int nid);

extern int remove_section_mapping(unsigned long start, unsigned long end);



#ifdef CONFIG_PPC_BOOK3S_64

arch/powerpc/mm/hash_utils_64.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ void resize_hpt_for_hotplug(unsigned long new_mem_size) 
	}

}



int hash__create_section_mapping(unsigned long start, unsigned long end)

int hash__create_section_mapping(unsigned long start, unsigned long end, int nid)

{

	int rc = htab_bolt_mapping(start, end, __pa(start),

				   pgprot_val(PAGE_KERNEL), mmu_linear_psize,

arch/powerpc/mm/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int memory_add_physaddr_to_nid(u64 start) 
}

#endif



int __weak create_section_mapping(unsigned long start, unsigned long end)

int __weak create_section_mapping(unsigned long start, unsigned long end, int nid)

{

	return -ENODEV;

}
@@ -137,7 +137,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, 
	resize_hpt_for_hotplug(memblock_phys_mem_size());



	start = (unsigned long)__va(start);

	rc = create_section_mapping(start, start + size);

	rc = create_section_mapping(start, start + size, nid);

	if (rc) {

		pr_warn("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",

			start, start + size, rc);