Merge tag 'v6.6-vfs.tmpfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[platform/kernel/linux-starfive.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index c39b363..f9e61e5 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -374,10 +374,6 @@ void __init memblock_discard(void)
                        kfree(memblock.reserved.regions);
                else
                        memblock_free_late(addr, size);
-               /* Reset to prevent UAF from stray frees. */
-               memblock.reserved.regions = memblock_reserved_init_regions;
-               memblock.reserved.cnt = 1;
-               memblock_remove_region(&memblock.reserved, 0);
        }
 
        if (memblock.memory.regions != memblock_memory_init_regions) {