From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757503Ab0GFWsf (ORCPT ); Tue, 6 Jul 2010 18:48:35 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:31937 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757236Ab0GFWnx (ORCPT ); Tue, 6 Jul 2010 18:43:53 -0400 From: Yinghai Lu 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 Subject: [PATCH 30/49] memblock: Export MEMBLOCK_ERROR again Date: Tue, 6 Jul 2010 15:39:23 -0700 Message-Id: <1278455982-24621-31-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1278455982-24621-1-git-send-email-yinghai@kernel.org> References: <1278455982-24621-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsmt355.oracle.com [141.146.40.155] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090206.4C33B16F.00C1,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org will used by x86 memblock_x86_find_in_range_node and nobootmem replacement -v2: use 0 instead -1ULL, Suggesed by Linus, so we don't need cast them later to unsigned long Signed-off-by: Yinghai Lu --- include/linux/memblock.h | 1 + mm/memblock.c | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 70bc467..1df1fc7 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -19,6 +19,7 @@ #include #define INIT_MEMBLOCK_REGIONS 128 +#define MEMBLOCK_ERROR 0 struct memblock_region { phys_addr_t base; diff --git a/mm/memblock.c b/mm/memblock.c index 74143d9..0bc972c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -27,8 +27,6 @@ int memblock_can_resize; static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1]; struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1]; -#define MEMBLOCK_ERROR (~(phys_addr_t)0) - /* inline so we don't get a warning when pr_debug is compiled out */ static inline const char *memblock_type_name(struct memblock_type *type) { -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 30/49] memblock: Export MEMBLOCK_ERROR again Date: Tue, 6 Jul 2010 15:39:23 -0700 Message-ID: <1278455982-24621-31-git-send-email-yinghai@kernel.org> References: <1278455982-24621-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1278455982-24621-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-arch.vger.kernel.org will used by x86 memblock_x86_find_in_range_node and nobootmem replacement -v2: use 0 instead -1ULL, Suggesed by Linus, so we don't need cast them later to unsigned long Signed-off-by: Yinghai Lu --- include/linux/memblock.h | 1 + mm/memblock.c | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 70bc467..1df1fc7 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -19,6 +19,7 @@ #include #define INIT_MEMBLOCK_REGIONS 128 +#define MEMBLOCK_ERROR 0 struct memblock_region { phys_addr_t base; diff --git a/mm/memblock.c b/mm/memblock.c index 74143d9..0bc972c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -27,8 +27,6 @@ int memblock_can_resize; static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1]; struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1]; -#define MEMBLOCK_ERROR (~(phys_addr_t)0) - /* inline so we don't get a warning when pr_debug is compiled out */ static inline const char *memblock_type_name(struct memblock_type *type) { -- 1.6.4.2