1 files changed, 5 insertions, 10 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index 618f94a1eedb..a838c50ca9a8 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1469,7 +1469,7 @@ void * __init memblock_alloc_try_nid_nopanic(
 }
 
 /**
- * memblock_alloc_try_nid - allocate boot memory block with panicking
+ * memblock_alloc_try_nid - allocate boot memory block
  * @size: size of memory block to be allocated in bytes
  * @align: alignment of the region and block's size
  * @min_addr: the lower bound of the memory region from where the allocation
@@ -1479,9 +1479,8 @@ void * __init memblock_alloc_try_nid_nopanic(
  *            allocate only from memory limited by memblock.current_limit value
  * @nid: nid of the free area to find, %NUMA_NO_NODE for any node
  *
- * Public panicking version of memblock_alloc_try_nid_nopanic()
- * which provides debug information (including caller info), if enabled,
- * and panics if the request can not be satisfied.
+ * Public function, provides additional debug information (including caller
+ * info), if enabled. This function zeroes the allocated memory.
  *
  * Return:
  * Virtual address of allocated memory block on success, NULL on failure.
@@ -1498,14 +1497,10 @@ void * __init memblock_alloc_try_nid(
                      &max_addr, (void *)_RET_IP_);
         ptr = memblock_alloc_internal(size, align,
                                            min_addr, max_addr, nid);
-        if (ptr) {
+        if (ptr)
                 memset(ptr, 0, size);
-                return ptr;
-        }
 
-        panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
-              __func__, (u64)size, (u64)align, nid, &min_addr, &max_addr);
-        return NULL;
+        return ptr;
 }
 
 /**