From 5f9ae0ccd4954f8262a4fa6d4c0ffe4237c26ccd Mon Sep 17 00:00:00 2001
From: Wentao Wang <witallwang@gmail.com>
Date: Tue, 5 Nov 2019 10:58:31 +0800
Subject: [PATCH] mm/page_alloc.c: deduplicate __memblock_free_early() and
 memblock_free()

mainline inclusion
from mainline-v5.0-rc1
commit d31cfe7bff9109476da92c245b56083e9b48d60a
category: bugfix
bugzilla: 23287
CVE: NA

-------------------------------------------------

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>
Signed-off-by: Chenwandun <chenwandun@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/memblock.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 8283bf03d0f1..8af95749cbf0 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1595,12 +1595,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);
 }
 
 /**
-- 
GitLab