Commit-ID: 37d8d4bf489e39eedc9537f8616fe87879b13cb0
Gitweb: http://git.kernel.org/tip/37d8d4bf489e39eedc9537f8616fe87879b13cb0
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
AuthorDate: Wed, 28 Jul 2010 15:20:58 +1000
Committer: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
CommitDate: Thu, 5 Aug 2010 12:56:29 +1000
memblock: Export MEMBLOCK_ERROR
will used by x86 memblock_x86_find_in_range_node and nobootmem replacement
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
---
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)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|