Re: [PATCH] powerpc/nohash64: clean pgtable.h

2019-05-03 Thread Michael Ellerman
On Thu, 2019-03-28 at 13:19:47 UTC, Christophe Leroy wrote:
> TRANSPARENT_HUGEPAGE is only supported by book3s
> 
> VMEMMAP_REGION_ID is never used
> 
> Signed-off-by: Christophe Leroy 

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/71faf8145cdc20f22aa398eb7b206b33

cheers


[PATCH] powerpc/nohash64: clean pgtable.h

2019-03-28 Thread Christophe Leroy
TRANSPARENT_HUGEPAGE is only supported by book3s

VMEMMAP_REGION_ID is never used

Signed-off-by: Christophe Leroy 
---
 arch/powerpc/include/asm/nohash/64/pgtable.h | 5 -
 1 file changed, 5 deletions(-)

diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h 
b/arch/powerpc/include/asm/nohash/64/pgtable.h
index e77ed9761632..68b2387b503b 100644
--- a/arch/powerpc/include/asm/nohash/64/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable.h
@@ -23,11 +23,7 @@
PUD_INDEX_SIZE + PGD_INDEX_SIZE + PAGE_SHIFT)
 #define PGTABLE_RANGE (ASM_CONST(1) << PGTABLE_EADDR_SIZE)
 
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-#define PMD_CACHE_INDEX(PMD_INDEX_SIZE + 1)
-#else
 #define PMD_CACHE_INDEXPMD_INDEX_SIZE
-#endif
 #define PUD_CACHE_INDEX PUD_INDEX_SIZE
 
 /*
@@ -73,7 +69,6 @@
 
 #define VMALLOC_REGION_ID  (REGION_ID(VMALLOC_START))
 #define KERNEL_REGION_ID   (REGION_ID(PAGE_OFFSET))
-#define VMEMMAP_REGION_ID  (0xfUL) /* Server only */
 #define USER_REGION_ID (0UL)
 
 /*
-- 
2.13.3