The patch titled Subject: mm: cma: fix totalcma_pages to include DT defined CMA regions has been removed from the -mm tree. Its filename was mm-cma-fix-totalcma_pages-to-include-dt-defined-cma-regions.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: "George G. Davis" <ggdavisiv@xxxxxxxxx> Subject: mm: cma: fix totalcma_pages to include DT defined CMA regions The totalcma_pages variable is not updated to account for CMA regions defined via device tree reserved-memory sub-nodes. Fix this omission by moving the calculation of totalcma_pages into cma_init_reserved_mem() instead of cma_declare_contiguous() such that it will include reserved memory used by all CMA regions. Signed-off-by: George G. Davis <george_davis@xxxxxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Acked-by: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/cma.c~mm-cma-fix-totalcma_pages-to-include-dt-defined-cma-regions mm/cma.c --- a/mm/cma.c~mm-cma-fix-totalcma_pages-to-include-dt-defined-cma-regions +++ a/mm/cma.c @@ -199,6 +199,7 @@ int __init cma_init_reserved_mem(phys_ad cma->order_per_bit = order_per_bit; *res_cma = cma; cma_area_count++; + totalcma_pages += (size / PAGE_SIZE); return 0; } @@ -337,7 +338,6 @@ int __init cma_declare_contiguous(phys_a if (ret) goto err; - totalcma_pages += (size / PAGE_SIZE); pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M, &base); return 0; _ Patches currently in -mm which might be from ggdavisiv@xxxxxxxxx are origin.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