From: Anton Blanchard Date: Tue, 16 Oct 2007 19:57:06 +0000 (-0500) Subject: Update PowerPC vmemmap code for 1TB segments X-Git-Tag: v5.15~45134 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e95206ab2c8cd6ea11318a5fe96b4ace534be750;p=mirror_ubuntu-kernels.git Update PowerPC vmemmap code for 1TB segments htab_bolt_mapping takes another argument now the 1TB code has been merged. Update vmemmap_populate to match. Signed-off-by: Anton Blanchard Signed-off-by: Linus Torvalds --- diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 29ed495444f5..702d884a338a 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -243,7 +243,8 @@ int __meminit vmemmap_populate(struct page *start_page, "physical %p.\n", start, p, __pa(p)); mapped = htab_bolt_mapping(start, start + page_size, - __pa(p), mode_rw, mmu_linear_psize); + __pa(p), mode_rw, mmu_linear_psize, + mmu_kernel_ssize); BUG_ON(mapped < 0); }