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

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>

diff --git a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
index 77ccf7cb6fcc9091e86893955375af68128e5660..76af5b0cb16eca5fe56684853717bfaf56157952 100644 (file)
--- a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
@@ -216,10 +216,8 @@ typedef struct {
        unsigned char high_slices_psize[0];
        unsigned long slb_addr_limit;
        struct slice_mask mask_base_psize; /* 4k or 16k */
-# ifdef CONFIG_HUGETLB_PAGE
        struct slice_mask mask_512k;
        struct slice_mask mask_8m;
-# endif
 #endif
        void *pte_frag;
 } 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)
 {
-#ifdef CONFIG_HUGETLB_PAGE
        if (psize == MMU_PAGE_512K)
                return &ctx->mask_512k;
        if (psize == MMU_PAGE_8M)
                return &ctx->mask_8m;
-#endif
+
        BUG_ON(psize != mmu_virtual_psize);
 
        return &ctx->mask_base_psize;