powerpc/mm/hash64: Factor out hash preload psize check
Currently we have a check in hash_preload() against the psize, which is only included when CONFIG_PPC_MM_SLICES is enabled. We want to expand this check in a subsequent patch, so factor it out to allow that. As a bonus it removes the #ifdef in the C code. Unfortunately we can't put this in the existing CONFIG_PPC_MM_SLICES block because it would require a forward declaration. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
925e2d1ded
commit
8bbc9b7b00
|
@ -1322,6 +1322,22 @@ int __hash_page(unsigned long ea, unsigned long msr, unsigned long trap,
|
|||
return hash_page_mm(mm, ea, access, trap, flags);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_MM_SLICES
|
||||
static bool should_hash_preload(struct mm_struct *mm, unsigned long ea)
|
||||
{
|
||||
/* We only prefault standard pages for now */
|
||||
if (unlikely(get_slice_psize(mm, ea) != mm->context.user_psize))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
static bool should_hash_preload(struct mm_struct *mm, unsigned long ea)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
void hash_preload(struct mm_struct *mm, unsigned long ea,
|
||||
unsigned long access, unsigned long trap)
|
||||
{
|
||||
|
@ -1334,11 +1350,8 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
|
|||
|
||||
BUG_ON(REGION_ID(ea) != USER_REGION_ID);
|
||||
|
||||
#ifdef CONFIG_PPC_MM_SLICES
|
||||
/* We only prefault standard pages for now */
|
||||
if (unlikely(get_slice_psize(mm, ea) != mm->context.user_psize))
|
||||
if (!should_hash_preload(mm, ea))
|
||||
return;
|
||||
#endif
|
||||
|
||||
DBG_LOW("hash_preload(mm=%p, mm->pgdir=%p, ea=%016lx, access=%lx,"
|
||||
" trap=%lx\n", mm, mm->pgd, ea, access, trap);
|
||||
|
|
Loading…
Reference in a new issue