Merge branch 'akpm/master'

[karo-tx-linux.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 625905523c2a1592f539c46f6721723d62376648..10ea908fd555727a676147c347abbf805dfff8c8 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -889,6 +889,11 @@ int __init memblock_is_reserved(phys_addr_t addr)
 
 int __init_memblock memblock_is_memory(phys_addr_t addr)
 {
+
+       if (unlikely(addr < memblock_start_of_DRAM() ||
+               addr >= memblock_end_of_DRAM()))
+               return 0;
+
        return memblock_search(&memblock.memory, addr) != -1;
 }