diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2010-07-28 15:20:58 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 12:56:29 +1000 |
| commit | 37d8d4bf489e39eedc9537f8616fe87879b13cb0 (patch) | |
| tree | 44987d75fa87aee2737bca59574e3b7459ad4797 | |
| parent | ea9e4376bb545e400a325b3d76fecd02815303c0 (diff) | |
| download | op-kernel-dev-37d8d4bf489e39eedc9537f8616fe87879b13cb0.zip op-kernel-dev-37d8d4bf489e39eedc9537f8616fe87879b13cb0.tar.gz | |
memblock: Export MEMBLOCK_ERROR
will used by x86 memblock_x86_find_in_range_node and nobootmem replacement
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | include/linux/memblock.h | 3 | ||||
| -rw-r--r-- | 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) { |
