[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1281071724-28740-40-git-send-email-benh@kernel.crashing.org>
Date: Fri, 6 Aug 2010 15:15:20 +1000
From: Benjamin Herrenschmidt <benh@...nel.crashing.org>
To: linux-kernel@...r.kernel.org
Cc: linux-mm@...ck.org, torvalds@...ux-foundation.org,
Yinghai Lu <yinghai@...nel.org>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>
Subject: [PATCH 39/43] memblock: Export MEMBLOCK_ERROR
From: Yinghai Lu <yinghai@...nel.org>
will used by x86 memblock_x86_find_in_range_node and nobootmem replacement
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@...nel.crashing.org>
---
include/linux/memblock.h | 3 ++-
mm/memblock.c | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index eed0f9b..1a9c29c 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -18,7 +18,8 @@
#include <asm/memblock.h>
-#define INIT_MEMBLOCK_REGIONS 128
+#define INIT_MEMBLOCK_REGIONS 128
+#define MEMBLOCK_ERROR (~(phys_addr_t)0)
struct memblock_region {
phys_addr_t base;
diff --git a/mm/memblock.c b/mm/memblock.c
index c3703ab..85cfa1d 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];
static 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.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists