From 8b526dda1c11be1d10030f8b174f46a1d16ba151 Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Wed, 14 Jan 2009 09:09:34 +0000 Subject: [PATCH] --- yaml --- r: 129857 b: refs/heads/master c: 9ba0fdbfaed2e74005d87fab948c5522b86ff733 h: refs/heads/master i: 129855: 97612db0727d3c6bb51bcb67dbbc6e95043fad47 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/slice.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a23b12eba03c..9657f8cb6adf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d9ee3ff3dbf815cd9ee18c166bb9b538e8057d2 +refs/heads/master: 9ba0fdbfaed2e74005d87fab948c5522b86ff733 diff --git a/trunk/arch/powerpc/mm/slice.c b/trunk/arch/powerpc/mm/slice.c index db44e02e045b..ba5194817f8a 100644 --- a/trunk/arch/powerpc/mm/slice.c +++ b/trunk/arch/powerpc/mm/slice.c @@ -710,9 +710,18 @@ int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, unsigned long len) { struct slice_mask mask, available; + unsigned int psize = mm->context.user_psize; mask = slice_range_to_mask(addr, len); - available = slice_mask_for_size(mm, mm->context.user_psize); + available = slice_mask_for_size(mm, psize); +#ifdef CONFIG_PPC_64K_PAGES + /* We need to account for 4k slices too */ + if (psize == MMU_PAGE_64K) { + struct slice_mask compat_mask; + compat_mask = slice_mask_for_size(mm, MMU_PAGE_4K); + or_mask(available, compat_mask); + } +#endif #if 0 /* too verbose */ slice_dbg("is_hugepage_only_range(mm=%p, addr=%lx, len=%lx)\n",