X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=mm%2Fnobootmem.c;h=3637809a18d04f9c20d1b00d70687ae1eb00b282;hb=HEAD;hp=36454d0f96ee6b91383554c83015a2b47e66f038;hpb=5e2d0967acd3fcb202f70534bc4534c4e4216cfa;p=mirror_ubuntu-artful-kernel.git diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 36454d0f96ee..3637809a18d0 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -146,22 +146,6 @@ static unsigned long __init free_low_memory_core_early(void) NULL) count += __free_memory_core(start, end); -#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK - { - phys_addr_t size; - - /* Free memblock.reserved array if it was allocated */ - size = get_allocated_memblock_reserved_regions_info(&start); - if (size) - count += __free_memory_core(start, start + size); - - /* Free memblock.memory array if it was allocated */ - size = get_allocated_memblock_memory_regions_info(&start); - if (size) - count += __free_memory_core(start, start + size); - } -#endif - return count; }