aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2007-10-16 15:57:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 16:10:58 -0400
commite95206ab2c8cd6ea11318a5fe96b4ace534be750 (patch)
treecb982f030026743158d33e1d17ee40fb1f132767 /arch/powerpc/mm
parent33ff910f0f466184ffc3514628f18403dcd86761 (diff)
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 <anton@samba.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/init_64.c3
1 files changed, 2 insertions, 1 deletions
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,
243 "physical %p.\n", start, p, __pa(p)); 243 "physical %p.\n", start, p, __pa(p));
244 244
245 mapped = htab_bolt_mapping(start, start + page_size, 245 mapped = htab_bolt_mapping(start, start + page_size,
246 __pa(p), mode_rw, mmu_linear_psize); 246 __pa(p), mode_rw, mmu_linear_psize,
247 mmu_kernel_ssize);
247 BUG_ON(mapped < 0); 248 BUG_ON(mapped < 0);
248 } 249 }
249 250