VisionFive2 Linux kernel

author: Mike Rapoport <rppt@linux.ibm.com> 2021-10-21 10:09:28 +0300 committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-10-21 18:30:49 -1000 commit: 6c9a54551977ddf2d6e22c21354b4fb88946f96e parent: 9d235ac01f54e8f8c1d967b25ac29e4313a41c5c

Commit Summary:

Revert "memblock: exclude NOMAP regions from kmemleak"

Diffstat:

1 file changed, 1 insertion, 4 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index b91df5cf54d3..103b052c016e 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -936,12 +936,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
  */
 int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
 {
-	int ret = memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
-
-	if (!ret)
-		kmemleak_free_part_phys(base, size);
-
-	return ret;
+	return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
 }
 
 /**