mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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: Miaohe Lin <linmiaohe@huawei.com>
Fixes: 3010f87650
("mm: discard memblock data later")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
This commit is contained in:
parent
754e0b0e35
commit
c94afc46ca
|
@ -366,14 +366,20 @@ void __init memblock_discard(void)
|
|||
addr = __pa(memblock.reserved.regions);
|
||||
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
||||
memblock.reserved.max);
|
||||
memblock_free_late(addr, size);
|
||||
if (memblock_reserved_in_slab)
|
||||
kfree(memblock.reserved.regions);
|
||||
else
|
||||
memblock_free_late(addr, size);
|
||||
}
|
||||
|
||||
if (memblock.memory.regions != memblock_memory_init_regions) {
|
||||
addr = __pa(memblock.memory.regions);
|
||||
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
||||
memblock.memory.max);
|
||||
memblock_free_late(addr, size);
|
||||
if (memblock_memory_in_slab)
|
||||
kfree(memblock.memory.regions);
|
||||
else
|
||||
memblock_free_late(addr, size);
|
||||
}
|
||||
|
||||
memblock_memory = NULL;
|
||||
|
|
Loading…
Reference in a new issue