1 files changed, 0 insertions, 35 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index a838c50ca9a8..0ab30d0185bc 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1434,41 +1434,6 @@ void * __init memblock_alloc_try_nid_raw(
 }
 
 /**
- * memblock_alloc_try_nid_nopanic - 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
- *        is preferred (phys address)
- * @max_addr: the upper bound of the memory region from where the allocation
- *            is preferred (phys address), or %MEMBLOCK_ALLOC_ACCESSIBLE to
- *            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 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.
- */
-void * __init memblock_alloc_try_nid_nopanic(
-                                phys_addr_t size, phys_addr_t align,
-                                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 %pF\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);
-        if (ptr)
-                memset(ptr, 0, size);
-        return ptr;
-}
-
-/**
  * 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