leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/8xx: get rid of #ifdef CONFIG_HUGETLB_PAGE for slices

Browse Source 
The 8xx only selects CONFIG_PPC_MM_SLICES when CONFIG_HUGETLB_PAGE
is set.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2019-04-25 14:29:34 +00:00 committed by Michael Ellerman
parent 203a1fa628
commit 33f128c649
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/nohash/32/mmu-8xx.h
View File

@ -216,10 +216,8 @@ typedef struct {
unsigned char high_slices_psize[0]; unsigned char high_slices_psize[0];
unsigned long slb_addr_limit; unsigned long slb_addr_limit;
struct slice_mask mask_base_psize; /* 4k or 16k */ struct slice_mask mask_base_psize; /* 4k or 16k */
# ifdef CONFIG_HUGETLB_PAGE
struct slice_mask mask_512k; struct slice_mask mask_512k;
struct slice_mask mask_8m; struct slice_mask mask_8m;
# endif
#endif #endif
void *pte_frag; void *pte_frag;
} mm_context_t; } mm_context_t;
@ -257,12 +255,11 @@ static inline void mm_ctx_set_slb_addr_limit(mm_context_t *ctx, unsigned long li
static inline struct slice_mask *slice_mask_for_size(mm_context_t *ctx, int psize) static inline struct slice_mask *slice_mask_for_size(mm_context_t *ctx, int psize)
{ {
#ifdef CONFIG_HUGETLB_PAGE
if (psize == MMU_PAGE_512K) if (psize == MMU_PAGE_512K)
return &ctx->mask_512k; return &ctx->mask_512k;
if (psize == MMU_PAGE_8M) if (psize == MMU_PAGE_8M)
return &ctx->mask_8m; return &ctx->mask_8m;
#endif
BUG_ON(psize != mmu_virtual_psize); BUG_ON(psize != mmu_virtual_psize);
return &ctx->mask_base_psize; return &ctx->mask_base_psize;