From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c) Date: Fri, 27 Apr 2012 13:23:43 -0700 Message-ID: <20120427132343.fbb443b9.akpm@linux-foundation.org> References: <20120427161146.95422142968526faaff615d4@canb.auug.org.au> <4F9ABF9C.2070707@xenotime.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57713 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759754Ab2D0UXq (ORCPT ); Fri, 27 Apr 2012 16:23:46 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: David Rientjes Cc: Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Weinberger , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki On Fri, 27 Apr 2012 11:44:24 -0700 (PDT) David Rientjes wrote: > On Fri, 27 Apr 2012, Randy Dunlap wrote: > > > On 04/26/2012 11:11 PM, Stephen Rothwell wrote: > > > > > Hi all, > > > > > > Changes since 20120424: > > > > > > > > uml on x86_64 (defconfig): > > > > mm/memcontrol.c:256:30: error: 'HUGE_MAX_HSTATE' undeclared here (not in a function) > > > > This is because of "memcg: add HugeTLB extension" from -mm. > > This patch is legal in C99, I wonder if Andrew would let us get away with > something like this so there's no a dozen #ifdefs in mm/memcontrol.c? > --- > diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h > --- a/arch/powerpc/include/asm/page.h > +++ b/arch/powerpc/include/asm/page.h > @@ -39,13 +39,13 @@ > #ifndef __ASSEMBLY__ > #ifdef CONFIG_HUGETLB_PAGE > extern unsigned int HPAGE_SHIFT; > +#define HUGE_MAX_HSTATE (MMU_PAGE_COUNT-1) > #else > #define HPAGE_SHIFT PAGE_SHIFT > #endif > #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) > #define HPAGE_MASK (~(HPAGE_SIZE - 1)) > #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) > -#define HUGE_MAX_HSTATE (MMU_PAGE_COUNT-1) > #endif > > /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */ > diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h > --- a/arch/tile/include/asm/page.h > +++ b/arch/tile/include/asm/page.h > @@ -136,9 +136,8 @@ static inline __attribute_const__ int get_order(unsigned long size) > > #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) > > -#define HUGE_MAX_HSTATE 6 > - > #ifdef CONFIG_HUGETLB_PAGE > +#define HUGE_MAX_HSTATE 6 > #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA > #endif > > diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h > --- a/arch/x86/include/asm/page_types.h > +++ b/arch/x86/include/asm/page_types.h > @@ -25,7 +25,9 @@ > #define HPAGE_MASK (~(HPAGE_SIZE - 1)) > #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) > > +#ifdef CONFIG_HUGETLB_PAGE > #define HUGE_MAX_HSTATE 2 > +#endif > > #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -324,6 +324,7 @@ static inline int hstate_index(struct hstate *h) > > #else > struct hstate {}; > +#define HUGE_MAX_HSTATE 0 > #define alloc_huge_page_node(h, nid) NULL > #define alloc_bootmem_huge_page(h) NULL > #define hstate_file(f) NULL Seems reasonable. But the CONFIG_HUGETLB_PAGE=y, CONFIG_MEM_RES_CTLR_HUGETLB=n combination will cause unneeded code generation and space consumption in memcontrol.c. I wonder if we can additionally do, within memcontrol.c: /* * Nice comment goes here */ #ifdef CONFIG_MEM_RES_CTLR_HUGETLB #define HUGE_MAX_HSTATE_FOO HUGE_MAX_HSTATE #else #define HUGE_MAX_HSTATE_FOO 0 #endif and s/HUGE_MAX_HSTATE/HUGE_MAX_HSTATE_FOO/ in that file.