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

Commit fda0440d authored by Rui Teng's avatar Rui Teng Committed by Michael Ellerman
Browse files

powerpc: Remove suspect CONFIG_PPC_BOOK3E #ifdefs in nohash/64/pgtable.h 



There are three #ifdef CONFIG_PPC_BOOK3E sections in nohash/64/pgtable.h.
And there should be no configurations possible which use nohash/64/pgtable.h
but don't also enable CONFIG_PPC_BOOK3E.

Suggested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarRui Teng <rui.teng@linux.vnet.ibm.com>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d8db9bc5

arch/powerpc/include/asm/nohash/64/pgtable.h

+1 −13
Original line number Diff line number Diff line
@@ -26,15 +26,11 @@ 
#else

#define PMD_CACHE_INDEX	PMD_INDEX_SIZE

#endif



/*

 * Define the address range of the kernel non-linear virtual area

 */



#ifdef CONFIG_PPC_BOOK3E

#define KERN_VIRT_START ASM_CONST(0x8000000000000000)

#else

#define KERN_VIRT_START ASM_CONST(0xD000000000000000)

#endif

#define KERN_VIRT_SIZE	ASM_CONST(0x0000100000000000)



/*
@@ -43,11 +39,7 @@ 
 * (we keep a quarter for the virtual memmap)

 */

#define VMALLOC_START	KERN_VIRT_START

#ifdef CONFIG_PPC_BOOK3E

#define VMALLOC_SIZE	(KERN_VIRT_SIZE >> 2)

#else

#define VMALLOC_SIZE	(KERN_VIRT_SIZE >> 1)

#endif

#define VMALLOC_END	(VMALLOC_START + VMALLOC_SIZE)



/*
@@ -85,12 +77,8 @@ 
 * Defines the address of the vmemap area, in its own region on

 * hash table CPUs and after the vmalloc space on Book3E

 */

#ifdef CONFIG_PPC_BOOK3E

#define VMEMMAP_BASE		VMALLOC_END

#define VMEMMAP_END		KERN_IO_START

#else

#define VMEMMAP_BASE		(VMEMMAP_REGION_ID << REGION_SHIFT)

#endif

#define vmemmap			((struct page *)VMEMMAP_BASE)