Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/mm/memblock.c b/mm/memblock.c
index 3f37a0bca5d5a56eb1acaa1bf576b8121acc64c6..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);
 }
 
 /**