mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

powerpc/mm: Remove PPC_MM_SLICES #ifdef for book3s64

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

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Aneesh Kumar K.V 2019-04-17 18:33:47 +05:30 committed by Michael Ellerman
parent 6161a37307
commit 4f40b15f33
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/include/asm/book3s/64/mmu.h
View file

@ -138,7 +138,6 @@ typedef struct {
/* NPU NMMU context */ /* NPU NMMU context */
struct npu_context *npu_context; struct npu_context *npu_context;
#ifdef CONFIG_PPC_MM_SLICES
/* SLB page size encodings*/ /* SLB page size encodings*/
unsigned char low_slices_psize[BITS_PER_LONG / BITS_PER_BYTE]; unsigned char low_slices_psize[BITS_PER_LONG / BITS_PER_BYTE];
unsigned char high_slices_psize[SLICE_ARRAY_SIZE]; unsigned char high_slices_psize[SLICE_ARRAY_SIZE];
@ -150,9 +149,6 @@ typedef struct {
# ifdef CONFIG_HUGETLB_PAGE # ifdef CONFIG_HUGETLB_PAGE
struct slice_mask mask_16m; struct slice_mask mask_16m;
struct slice_mask mask_16g; struct slice_mask mask_16g;
# endif
#else
u16 sllp; /* SLB page size encoding */
# endif # endif
unsigned long vdso_base; unsigned long vdso_base;
#ifdef CONFIG_PPC_SUBPAGE_PROT #ifdef CONFIG_PPC_SUBPAGE_PROT

13
arch/powerpc/include/asm/book3s/64/slice.h
View file

@ -2,8 +2,6 @@
#ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H #ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H
#define _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_SHIFT 28
#define SLICE_LOW_TOP (0x100000000ul) #define SLICE_LOW_TOP (0x100000000ul)
#define SLICE_NUM_LOW (SLICE_LOW_TOP >> SLICE_LOW_SHIFT) #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 SLICE_NUM_HIGH (H_PGTABLE_RANGE >> SLICE_HIGH_SHIFT)
#define GET_HIGH_SLICE_INDEX(addr) ((addr) >> 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 */ #endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */