ARM: dts: imx6ul: add support for Ka-Ro electronics TXUL mainboard

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

diff --git a/mm/memblock.c b/mm/memblock.c
index dd7989929f13ae16e265bff30fd958f1f13993cb..dfff740b856a3b4dc58bd89846c7c3093a37dfd4 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -585,6 +585,9 @@ repeat:
                                               nid, flags);
        }
 
+       if (!nr_new)
+               return 0;
+
        /*
         * If this was the first round, resize array and repeat for actual
         * insertions; otherwise, merge and return.
@@ -612,14 +615,12 @@ static int __init_memblock memblock_add_region(phys_addr_t base,
                                                int nid,
                                                unsigned long flags)
 {
-       struct memblock_type *type = &memblock.memory;
-
        memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n",
                     (unsigned long long)base,
                     (unsigned long long)base + size - 1,
                     flags, (void *)_RET_IP_);
 
-       return memblock_add_range(type, base, size, nid, flags);
+       return memblock_add_range(&memblock.memory, base, size, nid, flags);
 }
 
 int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
@@ -740,14 +741,12 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base,
                                                   int nid,
                                                   unsigned long flags)
 {
-       struct memblock_type *type = &memblock.reserved;
-
        memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n",
                     (unsigned long long)base,
                     (unsigned long long)base + size - 1,
                     flags, (void *)_RET_IP_);
 
-       return memblock_add_range(type, base, size, nid, flags);
+       return memblock_add_range(&memblock.reserved, base, size, nid, flags);
 }
 
 int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)