Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5643569b authored by Wentao Wang's avatar Wentao Wang Committed by Greg Kroah-Hartman
Browse files

mm/page_alloc.c: deduplicate __memblock_free_early() and memblock_free() 

[ Upstream commit d31cfe7bff9109476da92c245b56083e9b48d60a ]

Link: http://lkml.kernel.org/r/C8ECE1B7A767434691FEEFA3A01765D72AFB8E78@MX203CL03.corp.emc.com


Signed-off-by: default avatarWentao Wang <witallwang@gmail.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9696c765

mm/memblock.c

+1 −6
Original line number Diff line number Diff line
@@ -1537,12 +1537,7 @@ void * __init memblock_virt_alloc_try_nid( 
 */

void __init __memblock_free_early(phys_addr_t base, phys_addr_t size)

{

	phys_addr_t end = base + size - 1;



	memblock_dbg("%s: [%pa-%pa] %pF\n",

		     __func__, &base, &end, (void *)_RET_IP_);

	kmemleak_free_part_phys(base, size);

	memblock_remove_range(&memblock.reserved, base, size);

	memblock_free(base, size);

}



/**