Merge branch 'akpm' (patches from Andrew)

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

diff --git a/mm/memblock.c b/mm/memblock.c
index e2ca8dd..0ab5a74 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -315,7 +315,7 @@ static phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size,
  * Return:
  * Found address on success, 0 on failure.
  */
-phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start,
+static phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start,
                                        phys_addr_t end, phys_addr_t size,
                                        phys_addr_t align)
 {
@@ -1496,18 +1496,12 @@ void * __init memblock_alloc_exact_nid_raw(
                        phys_addr_t min_addr, phys_addr_t max_addr,
                        int nid)
 {
-       void *ptr;
-
        memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
                     __func__, (u64)size, (u64)align, nid, &min_addr,
                     &max_addr, (void *)_RET_IP_);
 
-       ptr = memblock_alloc_internal(size, align,
-                                          min_addr, max_addr, nid, true);
-       if (ptr && size > 0)
-               page_init_poison(ptr, size);
-
-       return ptr;
+       return memblock_alloc_internal(size, align, min_addr, max_addr, nid,
+                                      true);
 }
 
 /**
@@ -1534,18 +1528,12 @@ void * __init memblock_alloc_try_nid_raw(
                        phys_addr_t min_addr, phys_addr_t max_addr,
                        int nid)
 {
-       void *ptr;
-
        memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
                     __func__, (u64)size, (u64)align, nid, &min_addr,
                     &max_addr, (void *)_RET_IP_);
 
-       ptr = memblock_alloc_internal(size, align,
-                                          min_addr, max_addr, nid, false);
-       if (ptr && size > 0)
-               page_init_poison(ptr, size);
-
-       return ptr;
+       return memblock_alloc_internal(size, align, min_addr, max_addr, nid,
+                                      false);
 }
 
 /**