Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 252b77bdf65ef9ca65334e418e3ea231a3afb90b..9318b567ed7959721cb20239f410686b2635f335 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -580,10 +580,24 @@ int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size,
        return memblock_add_range(&memblock.memory, base, size, nid, 0);
 }
 
+static int __init_memblock memblock_add_region(phys_addr_t base,
+                                               phys_addr_t size,
+                                               int nid,
+                                               unsigned long flags)
+{
+       struct memblock_type *_rgn = &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(_rgn, base, size, nid, flags);
+}
+
 int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
 {
-       return memblock_add_range(&memblock.memory, base, size,
-                                  MAX_NUMNODES, 0);
+       return memblock_add_region(base, size, MAX_NUMNODES, 0);
 }
 
 /**
@@ -699,14 +713,14 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base,
                                                   int nid,
                                                   unsigned long flags)
 {
-       struct memblock_type *_rgn = &memblock.reserved;
+       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(_rgn, base, size, nid, flags);
+       return memblock_add_range(type, base, size, nid, flags);
 }
 
 int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)