xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/mm/slice: remove radix calls to the slice code

Browse Source 
This is a tidy up which removes radix MMU calls into the slice
code.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin
2018-03-07 11:37:17 +10:00
committed by Michael Ellerman
parent d262bd5a73
commit 014a32b30e
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/powerpc/mm/slice.c
View File

@@ -686,16 +686,8 @@ unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr)
unsigned char *psizes;
int index, mask_index;
/*
* Radix doesn't use slice, but can get enabled along with MMU_SLICE
*/
if (radix_enabled()) {
#ifdef CONFIG_PPC_64K_PAGES
return MMU_PAGE_64K;
#else
return MMU_PAGE_4K;
#endif
}
VM_BUG_ON(radix_enabled());
if (addr < SLICE_LOW_TOP) {
psizes = mm->context.low_slices_psize;
index = GET_LOW_SLICE_INDEX(addr);
@@ -778,14 +770,13 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
* for now as we only use slices with hugetlbfs enabled. This should
* be fixed as the generic code gets fixed.
*/
int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
unsigned long len)
{
const struct slice_mask *maskp;
unsigned int psize = mm->context.user_psize;
if (radix_enabled())
return 0;
VM_BUG_ON(radix_enabled());
maskp = slice_mask_for_size(mm, psize);
#ifdef CONFIG_PPC_64K_PAGES