From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756865AbaEPKF0 (ORCPT ); Fri, 16 May 2014 06:05:26 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:52190 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753960AbaEPKFZ (ORCPT ); Fri, 16 May 2014 06:05:25 -0400 Date: Fri, 16 May 2014 11:04:34 +0100 From: Catalin Marinas To: Mark Salter Cc: Will Deacon , Steve Capper , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] arm64: fix pud_huge() for 2-level pagetables Message-ID: <20140516100434.GG5624@arm.com> References: <1400163562-7481-1-git-send-email-msalter@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1400163562-7481-1-git-send-email-msalter@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 15, 2014 at 03:19:22PM +0100, Mark Salter wrote: > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c > index 5e9aec3..9bed38f 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -51,7 +51,11 @@ int pmd_huge(pmd_t pmd) > > int pud_huge(pud_t pud) > { > +#ifndef __PAGETABLE_PMD_FOLDED > return !(pud_val(pud) & PUD_TABLE_BIT); > +#else > + return 0; > +#endif > } > > int pmd_huge_support(void) > @@ -64,8 +68,10 @@ static __init int setup_hugepagesz(char *opt) > unsigned long ps = memparse(opt, &opt); > if (ps == PMD_SIZE) { > hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT); > +#ifndef __PAGETABLE_PMD_FOLDED > } else if (ps == PUD_SIZE) { > hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); > +#endif Since PMD_SIZE == PUD_SIZE when __PAGETABLE_PMD_FOLDED, do we need the #ifndef here? Maybe the compiler is smart enough to remove it but it's not on a critical path anyway, so I wouldn't bother. -- Catalin