mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
memblock: use kfree() to release kmalloced memblock regions
commitc94afc46ca
upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4185b788d3
commit
78706b051a
1 changed files with 8 additions and 2 deletions
|
@ -366,14 +366,20 @@ void __init memblock_discard(void)
|
||||||
addr = __pa(memblock.reserved.regions);
|
addr = __pa(memblock.reserved.regions);
|
||||||
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
||||||
memblock.reserved.max);
|
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) {
|
if (memblock.memory.regions != memblock_memory_init_regions) {
|
||||||
addr = __pa(memblock.memory.regions);
|
addr = __pa(memblock.memory.regions);
|
||||||
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
||||||
memblock.memory.max);
|
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;
|
memblock_memory = NULL;
|
||||||
|
|
Loading…
Reference in a new issue