| Message ID | 1472106670-3432-1-git-send-email-rui.teng@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Rui Teng <rui.teng@linux.vnet.ibm.com> writes: > 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: Michael Ellerman <mpe@ellerman.id.au> > Signed-off-by: Rui Teng <rui.teng@linux.vnet.ibm.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/nohash/64/pgtable.h | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h > index d4d808c..6213fc1 100644 > --- a/arch/powerpc/include/asm/nohash/64/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h > @@ -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) > > > -- > 2.7.4
On Thu, 2016-25-08 at 06:31:10 UTC, Rui Teng wrote: > 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: Michael Ellerman <mpe@ellerman.id.au> > Signed-off-by: Rui Teng <rui.teng@linux.vnet.ibm.com> > Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/fda0440d82d38e603cd713e997fdfe cheers
diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h index d4d808c..6213fc1 100644 --- a/arch/powerpc/include/asm/nohash/64/pgtable.h +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h @@ -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)
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: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Rui Teng <rui.teng@linux.vnet.ibm.com> --- arch/powerpc/include/asm/nohash/64/pgtable.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)