From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 31/50] memblock: Export MEMBLOCK_ERROR again Date: Tue, 13 Jul 2010 00:10:25 -0700 Message-ID: <1279005044-24777-32-git-send-email-yinghai@kernel.org> References: <1279005044-24777-1-git-send-email-yinghai@kernel.org> Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:28535 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753208Ab0GMHQV (ORCPT ); Tue, 13 Jul 2010 03:16:21 -0400 In-Reply-To: <1279005044-24777-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 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..89749c4 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 796ef8c..3d0a754 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 Return-Path: Received: from rcsinet10.oracle.com ([148.87.113.121]:28535 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753208Ab0GMHQV (ORCPT ); Tue, 13 Jul 2010 03:16:21 -0400 From: Yinghai Lu Subject: [PATCH 31/50] memblock: Export MEMBLOCK_ERROR again Date: Tue, 13 Jul 2010 00:10:25 -0700 Message-ID: <1279005044-24777-32-git-send-email-yinghai@kernel.org> In-Reply-To: <1279005044-24777-1-git-send-email-yinghai@kernel.org> References: <1279005044-24777-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: <20100713071025.cfsUw1Qt4rRWNq_AvuM_MqQkzHEmoXoRfrK8D1wZR8Y@z> 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..89749c4 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 796ef8c..3d0a754 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