X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fmemblock.c;h=8d9b768638ee432b4346e7a958263f726f29e0f8;hb=f13d88f8a1e42a0cb78d859cc091be7d3d8a51ca;hp=ba79bc9c1a6b68d889805055b639b19af848578b;hpb=b3885c273c1ef46c03420aea5d2203effa4249b9;p=linux

diff --git a/mm/memblock.c b/mm/memblock.c
index ba79bc9c1a6b..8d9b768638ee 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1363,17 +1363,12 @@ again:
 	return ret;
 }
 
-phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
-{
-	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)
 {
 	phys_addr_t alloc;
 
-	alloc = __memblock_alloc_base(size, align, max_addr);
+	alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
+					MEMBLOCK_NONE);
 
 	if (alloc == 0)
 		panic("ERROR: Failed to allocate %pa bytes below %pa.\n",