Commit c94afc46 authored by Miaohe Lin's avatar Miaohe Lin Committed by Mike Rapoport
Browse files

memblock: use kfree() to release kmalloced memblock regions 



memblock.{reserved,memory}.regions may be allocated using kmalloc() in
memblock_double_array(). Use kfree() to release these kmalloced regions
indicated by memblock_{reserved,memory}_in_slab.

Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Fixes: 3010f876 ("mm: discard memblock data later")
Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
parent 754e0b0e

mm/memblock.c

+8 −2
Original line number Diff line number Diff line
@@ -366,6 +366,9 @@ void __init memblock_discard(void) 
		addr = __pa(memblock.reserved.regions);

		size = PAGE_ALIGN(sizeof(struct memblock_region) *

				  memblock.reserved.max);

		if (memblock_reserved_in_slab)

			kfree(memblock.reserved.regions);

		else

			memblock_free_late(addr, size);

	}
@@ -373,6 +376,9 @@ void __init memblock_discard(void) 
		addr = __pa(memblock.memory.regions);

		size = PAGE_ALIGN(sizeof(struct memblock_region) *

				  memblock.memory.max);

		if (memblock_memory_in_slab)

			kfree(memblock.memory.regions);

		else

			memblock_free_late(addr, size);

	}