From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49160 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751236AbdHaF5d (ORCPT ); Thu, 31 Aug 2017 01:57:33 -0400 Subject: Patch "mm: cma: fix totalcma_pages to include DT defined CMA regions" has been added to the 3.18-stable tree To: ggdavisiv@gmail.com, akpm@linux-foundation.org, aneesh.kumar@linux.vnet.ibm.com, george_davis@mentor.com, gregkh@linuxfoundation.org, iamjoonsoo.kim@lge.com, laurent.pinchart+renesas@ideasonboard.com, m.szyprowski@samsung.com, mina86@mina86.com, torvalds@linux-foundation.org Cc: , From: Date: Thu, 31 Aug 2017 07:57:32 +0200 Message-ID: <150415905243112@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled mm: cma: fix totalcma_pages to include DT defined CMA regions to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-cma-fix-totalcma_pages-to-include-dt-defined-cma-regions.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 94737a85f332aee75255960eaa16e89ddfa4c75a Mon Sep 17 00:00:00 2001 From: "George G. Davis" Date: Wed, 11 Feb 2015 15:26:27 -0800 Subject: mm: cma: fix totalcma_pages to include DT defined CMA regions From: George G. Davis commit 94737a85f332aee75255960eaa16e89ddfa4c75a upstream. 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 Cc: Marek Szyprowski Acked-by: Michal Nazarewicz Cc: Joonsoo Kim Cc: "Aneesh Kumar K.V" Cc: Laurent Pinchart Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/cma.c +++ b/mm/cma.c @@ -200,6 +200,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; } @@ -338,7 +339,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 stable-queue which might be from ggdavisiv@gmail.com are queue-3.18/mm-cma-fix-totalcma_pages-to-include-dt-defined-cma-regions.patch