From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934238AbcHYNrt (ORCPT ); Thu, 25 Aug 2016 09:47:49 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:51227 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757829AbcHYNrr (ORCPT ); Thu, 25 Aug 2016 09:47:47 -0400 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: aneesh.kumar@linux.vnet.ibm.com From: "Aneesh Kumar K.V" To: Rui Teng , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, Rui Teng Subject: Re: [PATCH] powerpc: Remove suspect CONFIG_PPC_BOOK3E #ifdefs in nohash/64/pgtable.h In-Reply-To: <1472106670-3432-1-git-send-email-rui.teng@linux.vnet.ibm.com> References: <1472106670-3432-1-git-send-email-rui.teng@linux.vnet.ibm.com> Date: Thu, 25 Aug 2016 19:17:38 +0530 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16082513-8235-0000-0000-0000090ECD00 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005639; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000183; SDB=6.00749523; UDB=6.00353879; IPR=6.00522181; BA=6.00004675; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012462; XFM=3.00000011; UTC=2016-08-25 13:47:45 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16082513-8236-0000-0000-00003442BC0C Message-Id: <8760qp55ad.fsf@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-08-25_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608250169 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rui Teng 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 > Signed-off-by: Rui Teng Reviewed-by: Aneesh Kumar K.V > --- > 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