From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 05/25] lmb: Prepare to include linux/lmb.h in core file Date: Tue, 22 Jun 2010 10:26:34 -0700 Message-ID: <1277227614-11581-6-git-send-email-yinghai@kernel.org> References: <1277227614-11581-1-git-send-email-yinghai@kernel.org> Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:32684 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758684Ab0FVR2c (ORCPT ); Tue, 22 Jun 2010 13:28:32 -0400 In-Reply-To: <1277227614-11581-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Be Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Need to add protection in linux/lmb.h, to prepare to include it in mm/page_alloc.c and mm/bootmem.c etc. Signed-off-by: Yinghai Lu --- include/linux/lmb.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index eb8a5a3..d529232 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -2,6 +2,7 @@ #define _LINUX_LMB_H #ifdef __KERNEL__ +#ifdef CONFIG_HAVE_LMB /* * Logical memory blocks. * @@ -144,6 +145,8 @@ static inline unsigned long lmb_region_pages(const struct lmb_region *reg) region++) +#endif /* CONFIG_HAVE_LMB */ + #endif /* __KERNEL__ */ #endif /* _LINUX_LMB_H */ -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet10.oracle.com ([148.87.113.121]:32684 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758684Ab0FVR2c (ORCPT ); Tue, 22 Jun 2010 13:28:32 -0400 From: Yinghai Lu Subject: [PATCH 05/25] lmb: Prepare to include linux/lmb.h in core file Date: Tue, 22 Jun 2010 10:26:34 -0700 Message-ID: <1277227614-11581-6-git-send-email-yinghai@kernel.org> In-Reply-To: <1277227614-11581-1-git-send-email-yinghai@kernel.org> References: <1277227614-11581-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100622172634.CWXR_bDkI0VNh8ouCklOSRBnqgR7rbLYtxD5n9u_FMw@z> Need to add protection in linux/lmb.h, to prepare to include it in mm/page_alloc.c and mm/bootmem.c etc. Signed-off-by: Yinghai Lu --- include/linux/lmb.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index eb8a5a3..d529232 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -2,6 +2,7 @@ #define _LINUX_LMB_H #ifdef __KERNEL__ +#ifdef CONFIG_HAVE_LMB /* * Logical memory blocks. * @@ -144,6 +145,8 @@ static inline unsigned long lmb_region_pages(const struct lmb_region *reg) region++) +#endif /* CONFIG_HAVE_LMB */ + #endif /* __KERNEL__ */ #endif /* _LINUX_LMB_H */ -- 1.6.4.2