From d0853402293ad321a9bf93648d6a58933fd80a8b Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 28 Jul 2010 15:20:58 +1000 Subject: [PATCH] --- yaml --- r: 212714 b: refs/heads/master c: 37d8d4bf489e39eedc9537f8616fe87879b13cb0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/memblock.h | 3 ++- trunk/mm/memblock.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index edeba6b0a9f7..18fbb48774d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea9e4376bb545e400a325b3d76fecd02815303c0 +refs/heads/master: 37d8d4bf489e39eedc9537f8616fe87879b13cb0 diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h index eed0f9b8e526..1a9c29cc92fa 100644 --- a/trunk/include/linux/memblock.h +++ b/trunk/include/linux/memblock.h @@ -18,7 +18,8 @@ #include -#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/trunk/mm/memblock.c b/trunk/mm/memblock.c index c3703abf057e..85cfa1d3ab28 100644 --- a/trunk/mm/memblock.c +++ b/trunk/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) {