Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f40b15f authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: Remove PPC_MM_SLICES #ifdef for book3s64 



Book3s64 always have PPC_MM_SLICES enabled. So remove the unncessary #ifdef

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6161a373

arch/powerpc/include/asm/book3s/64/mmu.h

+0 −4
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ typedef struct { 
	/* NPU NMMU context */

	struct npu_context *npu_context;



#ifdef CONFIG_PPC_MM_SLICES

	 /* SLB page size encodings*/

	unsigned char low_slices_psize[BITS_PER_LONG / BITS_PER_BYTE];

	unsigned char high_slices_psize[SLICE_ARRAY_SIZE];
@@ -150,9 +149,6 @@ typedef struct { 
# ifdef CONFIG_HUGETLB_PAGE

	struct slice_mask mask_16m;

	struct slice_mask mask_16g;

# endif

#else

	u16 sllp;		/* SLB page size encoding */

# endif

	unsigned long vdso_base;

#ifdef CONFIG_PPC_SUBPAGE_PROT

arch/powerpc/include/asm/book3s/64/slice.h

+0 −13
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H

#define _ASM_POWERPC_BOOK3S_64_SLICE_H



#ifdef CONFIG_PPC_MM_SLICES



#define SLICE_LOW_SHIFT		28

#define SLICE_LOW_TOP		(0x100000000ul)

#define SLICE_NUM_LOW		(SLICE_LOW_TOP >> SLICE_LOW_SHIFT)
@@ -13,15 +11,4 @@ 
#define SLICE_NUM_HIGH		(H_PGTABLE_RANGE >> SLICE_HIGH_SHIFT)

#define GET_HIGH_SLICE_INDEX(addr)	((addr) >> SLICE_HIGH_SHIFT)



#else /* CONFIG_PPC_MM_SLICES */



#define get_slice_psize(mm, addr)	((mm)->context.user_psize)

#define slice_set_user_psize(mm, psize)		\

do {						\

	(mm)->context.user_psize = (psize);	\

	(mm)->context.sllp = SLB_VSID_USER | mmu_psize_defs[(psize)].sllp; \

} while (0)



#endif /* CONFIG_PPC_MM_SLICES */



#endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */