The base address is already guaranteed to be in the region by
memblock_search().
This patch removes the check on base, also a little refine in a macro.
Signed-off-by: Wei Yang <richard.weiy...@gmail.com>
---
include/linux/memblock.h | 5 ++---
mm/memblock.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 3106ac1..e611819 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -408,9 +408,8 @@ static inline unsigned long
memblock_region_reserved_end_pfn(const struct memblo
region++)
#define for_each_memblock_type(memblock_type, rgn) \
- idx = 0; \
- rgn = &memblock_type->regions[idx]; \
- for (idx = 0; idx < memblock_type->cnt; \
+ for (idx = 0, rgn = &memblock_type->regions[idx]; \
+ idx < memblock_type->cnt; \
idx++,rgn = &memblock_type->regions[idx])
#ifdef CONFIG_MEMTEST
diff --git a/mm/memblock.c b/mm/memblock.c
index ac12489..9d402d05 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1557,7 +1557,7 @@ int __init_memblock memblock_is_region_memory(phys_addr_t
base, phys_addr_t size
if (idx == -1)
return 0;
- return memblock.memory.regions[idx].base <= base &&
+ return /* memblock.memory.regions[idx].base <= base && */
(memblock.memory.regions[idx].base +
memblock.memory.regions[idx].size) >= end;
}
--
1.7.9.5
