From d31cfe7bff9109476da92c245b56083e9b48d60a Mon Sep 17 00:00:00 2001
From: Wentao Wang <witallwang@gmail.com>
Date: Fri, 28 Dec 2018 00:35:26 -0800
Subject: [PATCH] mm/page_alloc.c: deduplicate __memblock_free_early() and
memblock_free()
Link: http://lkml.kernel.org/r/C8ECE1B7A767434691FEEFA3A01765D72AFB8E78@MX203CL03.corp.emc.com
Signed-off-by: Wentao Wang <witallwang@gmail.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
mm/memblock.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index a53d8697612c5..207058b6891bd 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1546,12 +1546,7 @@ void * __init memblock_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);
}
/**
--
GitLab