From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx193.postini.com [74.125.245.193]) by kanga.kvack.org (Postfix) with SMTP id B6AA26B002C for ; Fri, 2 Mar 2012 07:20:29 -0500 (EST) Date: Fri, 2 Mar 2012 13:20:22 +0100 From: Andrea Arcangeli Subject: Re: [PATCH v2 1/2] thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE Message-ID: <20120302122022.GM28383@redhat.com> References: <1330648313-32593-1-git-send-email-n-horiguchi@ah.jp.nec.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1330648313-32593-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: owner-linux-mm@kvack.org List-ID: To: Naoya Horiguchi Cc: linux-mm@kvack.org, Andrew Morton , KAMEZAWA Hiroyuki , Daisuke Nishimura , Hillf Danton , linux-kernel@vger.kernel.org On Thu, Mar 01, 2012 at 07:31:52PM -0500, Naoya Horiguchi wrote: > These macros will be used in later patch, where all usage are expected > to be optimized away without #ifdef CONFIG_TRANSPARENT_HUGEPAGE. > But to detect unexpected usages, we convert existing BUG() to BUILD_BUG(). > > Signed-off-by: Naoya Horiguchi > --- > include/linux/huge_mm.h | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git linux-next-20120228.orig/include/linux/huge_mm.h linux-next-20120228/include/linux/huge_mm.h > index f56cacb..c8af7a2 100644 > --- linux-next-20120228.orig/include/linux/huge_mm.h > +++ linux-next-20120228/include/linux/huge_mm.h > @@ -51,6 +51,9 @@ extern pmd_t *page_check_address_pmd(struct page *page, > unsigned long address, > enum page_check_address_pmd_flag flag); > > +#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PMD_NR (1< + > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define HPAGE_PMD_SHIFT HPAGE_SHIFT > #define HPAGE_PMD_MASK HPAGE_MASK > @@ -102,8 +105,6 @@ extern void __split_huge_page_pmd(struct mm_struct *mm, pmd_t *pmd); > BUG_ON(pmd_trans_splitting(*____pmd) || \ > pmd_trans_huge(*____pmd)); \ > } while (0) > -#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > -#define HPAGE_PMD_NR (1< #if HPAGE_PMD_ORDER > MAX_ORDER > #error "hugepages can't be allocated by the buddy allocator" > #endif I did the same change to make AutoNUMA build in all configs/archs. > @@ -158,9 +159,9 @@ static inline struct page *compound_trans_head(struct page *page) > return page; > } > #else /* CONFIG_TRANSPARENT_HUGEPAGE */ > -#define HPAGE_PMD_SHIFT ({ BUG(); 0; }) > -#define HPAGE_PMD_MASK ({ BUG(); 0; }) > -#define HPAGE_PMD_SIZE ({ BUG(); 0; }) > +#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) > +#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; }) > +#define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; }) Builds with my config with THP=off. Thanks. Reviewed-by: Andrea Arcangeli -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org