Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e95206ab2c8cd6ea11318a5fe96b4ace534be750 Commit: e95206ab2c8cd6ea11318a5fe96b4ace534be750 Parent: 33ff910f0f466184ffc3514628f18403dcd86761 Author: Anton Blanchard <[EMAIL PROTECTED]> AuthorDate: Tue Oct 16 14:57:06 2007 -0500 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Tue Oct 16 13:10:58 2007 -0700
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 <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- arch/powerpc/mm/init_64.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 29ed495..702d884 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); } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html