2 files changed, 4 insertions, 14 deletions

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 859b55b66db2..4db53f7c6b17 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -446,9 +446,6 @@ static inline bool memblock_bottom_up(void)
 phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
                                         phys_addr_t start, phys_addr_t end,
                                         enum memblock_flags flags);
-phys_addr_t memblock_alloc_base_nid(phys_addr_t size,
-                                        phys_addr_t align, phys_addr_t max_addr,
-                                        int nid, enum memblock_flags flags);
 phys_addr_t memblock_alloc_base(phys_addr_t size, phys_addr_t align,
                                 phys_addr_t max_addr);
 phys_addr_t __memblock_alloc_base(phys_addr_t size, phys_addr_t align,
diff --git a/mm/memblock.c b/mm/memblock.c
index 470601115892..e9e440cfd210 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1289,21 +1289,14 @@ phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
                                         flags);
 }
 
-phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
-                                        phys_addr_t align, phys_addr_t max_addr,
-                                        int nid, enum memblock_flags flags)
-{
-        return memblock_alloc_range_nid(size, align, 0, max_addr, nid, flags);
-}
-
 phys_addr_t __init memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)
 {
         enum memblock_flags flags = choose_memblock_flags();
         phys_addr_t ret;
 
 again:
-        ret = memblock_alloc_base_nid(size, align, MEMBLOCK_ALLOC_ACCESSIBLE,
-                                      nid, flags);
+        ret = memblock_alloc_range_nid(size, align, 0,
+                                       MEMBLOCK_ALLOC_ACCESSIBLE, nid, flags);
 
         if (!ret && (flags & MEMBLOCK_MIRROR)) {
                 flags &= ~MEMBLOCK_MIRROR;
@@ -1314,8 +1307,8 @@ again:
 
 phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
 {
-        return memblock_alloc_base_nid(size, align, max_addr, NUMA_NO_NODE,
-                                       MEMBLOCK_NONE);
+        return memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
+                                        MEMBLOCK_NONE);
 }
 
 phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)