The patch titled
Subject: mm/cma.c: free the reserved memblock when free cma pages
has been removed from the -mm tree. Its filename was
free-the-reserved-memblock-when-free-cma-pages.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: "Wang, Yalin" <Yalin.Wang@xxxxxxxxxxxxxx>
Subject: mm/cma.c: free the reserved memblock when free cma pages
Add memblock_free to also free the reserved memblock, so that the cma
pages are not marked as reserved memory in
/sys/kernel/debug/memblock/reserved debug file
Marek said:
: When cma_activate_area() is called noone should use memblock to allocate
: memory, but it is ok to call memblock_free() to update memblock
: statistics, so users won't be confused by cma entries in
: /sys/kernel/debug/memblock/reserved file.
Signed-off-by: Yalin Wang <yalin.wang@xxxxxxxxxxxxxx>
Acked-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/cma.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/cma.c~free-the-reserved-memblock-when-free-cma-pages mm/cma.c
--- a/mm/cma.c~free-the-reserved-memblock-when-free-cma-pages
+++ a/mm/cma.c
@@ -115,6 +115,8 @@ static int __init cma_activate_area(stru
goto err;
}
init_cma_reserved_pageblock(pfn_to_page(base_pfn));
+ memblock_free(__pfn_to_phys(base_pfn),
+ pageblock_nr_pages * PAGE_SIZE);
} while (--i);
mutex_init(&cma->lock);
_
Patches currently in -mm which might be from Yalin.Wang@xxxxxxxxxxxxxx are
free-the-reserved-memblock-when-free-cma-pages-v2.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
