On Fri, Jan 09 2015, "George G. Davis" <ggdavi...@gmail.com> wrote:
> 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_da...@mentor.com>
Acked-by: Michal Nazarewicz <min...@mina86.com>
> ---
> mm/cma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/cma.c b/mm/cma.c
> index a85ae28..75016fd 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -199,6 +199,7 @@ int __init cma_init_reserved_mem(phys_addr_t base,
> phys_addr_t size,
> 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_addr_t base,
> 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;
> --
> 1.9.3
>
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +--<m...@google.com>--<xmpp:min...@jabber.org>--ooO--(_)--Ooo--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
