From mboxrd@z Thu Jan  1 00:00:00 1970
From: will.deacon@arm.com (Will Deacon)
Date: Fri, 11 Sep 2015 12:02:39 +0100
Subject: [PATCH] arm64: dma-mapping: check whether cma area is
 initialized or not
In-Reply-To: <20150911110036.GC5771@e104818-lin.cambridge.arm.com>
References: <1441957787-5526-1-git-send-email-jszhang@marvell.com>
 <20150911110036.GC5771@e104818-lin.cambridge.arm.com>
Message-ID: <20150911110239.GB15917@arm.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Fri, Sep 11, 2015 at 12:00:37PM +0100, Catalin Marinas wrote:
> On Fri, Sep 11, 2015 at 03:49:47PM +0800, Jisheng Zhang wrote:
> > If CMA is turned on and CMA size is set to zero, kernel should
> > behave as if CMA was not enabled at compile time.
> > Every dma allocation should check existence of cma area
> > before requesting memory.
> > 
> > Arm has done this by commit e464ef16c4f0 ("arm: dma-mapping: add
> > checking cma area initialized"), also do this for arm64.
> > 
> > Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> 
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
> 
> Will should pick this up for 4.3.

Yup, queued already. I'll push out at -rc1.

Will