[PATCH V2 2/2] mm/memblock.c: check return value of memblock_reserve() in memblock_virt_alloc_internal()

[Wei Yang]

memblock_reserve() may fail in case there is not enough regions.

This patch checks the return value.

Signed-off-by: Wei Yang <richard.weiy...@gmail.com>
---
 mm/memblock.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index cd85303..93fa687 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1274,18 +1274,17 @@ static void * __init memblock_virt_alloc_internal(
 
        if (max_addr > memblock.current_limit)
                max_addr = memblock.current_limit;
-
 again:
        alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
                                            nid, flags);
-       if (alloc)
+       if (alloc && !memblock_reserve(alloc, size))
                goto done;
 
        if (nid != NUMA_NO_NODE) {
                alloc = memblock_find_in_range_node(size, align, min_addr,
                                                    max_addr, NUMA_NO_NODE,
                                                    flags);
-               if (alloc)
+               if (alloc && !memblock_reserve(alloc, size))
                        goto done;
        }
 
@@ -1303,7 +1302,6 @@ static void * __init memblock_virt_alloc_internal(
 
        return NULL;
 done:
-       memblock_reserve(alloc, size);
        ptr = phys_to_virt(alloc);
        memset(ptr, 0, size);
 
-- 
2.5.0