1 files changed, 16 insertions, 13 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index 1c2ef2c7edab..9c0aeef19440 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -266,31 +266,34 @@ static void __init_memblock memblock_remove_region(struct memblock_type *type, u
         }
 }
 
+#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
+
 phys_addr_t __init_memblock get_allocated_memblock_reserved_regions_info(
                                         phys_addr_t *addr)
 {
         if (memblock.reserved.regions == memblock_reserved_init_regions)
                 return 0;
 
-        /*
-         * Don't allow nobootmem allocator to free reserved memory regions
-         * array if
-         *  - CONFIG_DEBUG_FS is enabled;
-         *  - CONFIG_ARCH_DISCARD_MEMBLOCK is not enabled;
-         *  - reserved memory regions array have been resized during boot.
-         * Otherwise debug_fs entry "sys/kernel/debug/memblock/reserved"
-         * will show garbage instead of state of memory reservations.
-         */
-        if (IS_ENABLED(CONFIG_DEBUG_FS) &&
-            !IS_ENABLED(CONFIG_ARCH_DISCARD_MEMBLOCK))
-                return 0;
-
         *addr = __pa(memblock.reserved.regions);
 
         return PAGE_ALIGN(sizeof(struct memblock_region) *
                           memblock.reserved.max);
 }
 
+phys_addr_t __init_memblock get_allocated_memblock_memory_regions_info(
+                                        phys_addr_t *addr)
+{
+        if (memblock.memory.regions == memblock_memory_init_regions)
+                return 0;
+
+        *addr = __pa(memblock.memory.regions);
+
+        return PAGE_ALIGN(sizeof(struct memblock_region) *
+                          memblock.memory.max);
+}
+
+#endif
+
 /**
  * memblock_double_array - double the size of the memblock regions array
  * @type: memblock type of the regions array being doubled