linux-mips
[Top] [All Lists]

Re: [patch] mips, mm: avoid using HPAGE constants without CONFIG_HUGETLB

To: David Daney <ddaney.cavm@gmail.com>
Subject: Re: [patch] mips, mm: avoid using HPAGE constants without CONFIG_HUGETLB_PAGE
From: David Rientjes <rientjes@google.com>
Date: Mon, 21 Nov 2011 14:31:41 -0800 (PST)
Cc: Hillf Danton <dhillf@gmail.com>, Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, Andrew Morton <akpm@linux-foundation.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=beta; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=8PdB5rYWIslJ88xd13YVYkAw2r7mcpbzgzfggJv29YA=; b=XI4qTLRDuf6YIn+ZFyx27e3hBpzN+Ew4NlXIedU7VSWsNHoTit2EJHqk1lV0QZwJ/6 ZYRrsOPh1/Ble9wJ+ApQ==
In-reply-to: <4ECAA5B8.3080908@gmail.com>
References: <alpine.DEB.2.00.1111191855410.5457@chino.kir.corp.google.com> <CAJd=RBBmODwpUi1_eObE47yCQVfEGLHyy45=aqUtxM-9Bpki6A@mail.gmail.com> <4ECAA5B8.3080908@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Alpine 2.00 (DEB 1167 2008-08-23)
On Mon, 21 Nov 2011, David Daney wrote:

> > --- a/arch/mips/include/asm/page.h  Sun Nov 20 13:08:44 2011
> > +++ b/arch/mips/include/asm/page.h  Sun Nov 20 13:17:43 2011
> > @@ -38,6 +38,11 @@
> >   #define HPAGE_SIZE        (_AC(1,UL)<<  HPAGE_SHIFT)
> >   #define HPAGE_MASK        (~(HPAGE_SIZE - 1))
> >   #define HUGETLB_PAGE_ORDER        (HPAGE_SHIFT - PAGE_SHIFT)
> > +#else
> > +#define HPAGE_SHIFT        ({ BUG(); 0; })
> > +#define HPAGE_SIZE ({ BUG(); 0; })
> > +#define HPAGE_MASK ({ BUG(); 0; })
> 
> These three are taken care of in linux/hugetlb.h by the patches that Andrew
> Morton has in his tree, the full discussion starts at:
> 
> http://www.linux-mips.org/archives/linux-mips/2011-11/msg00412.html
> 

Those patches were removed since Linus picked up my patch instead, so I 
think you'll want the patch I'm proposing here.

<Prev in Thread] Current Thread [Next in Thread>