Re: [PATCH] arm64: fix build error if DMA_CMA is enabled

[Laura Abbott]

On 1/24/2014 7:37 AM, Catalin Marinas wrote:
> On Fri, Jan 24, 2014 at 08:23:08AM +0000, Pankaj Dubey wrote:
> > arm64/include/asm/dma-contiguous.h is trying to include
> > <asm-genric/dma-contiguous.h> which does not exist, and thus failing
> > build for arm64 if we enable CONFIG_DMA_CMA. This patch fixes build
> > error by removing unwanted header inclusion from arm64's dma-contiguous.h.
> >
> > Signed-off-by: Pankaj Dubey <pankaj.dubey@xxxxxxxxxxx>
> > Signed-off-by: Somraj Mani <somraj.mani@xxxxxxxxxxx>
> > ---
> >   arch/arm64/include/asm/dma-contiguous.h |    1 -
> >   1 file changed, 1 deletion(-)
> >
> > diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
> > index d6aacb6..14c4c0c 100644
> > --- a/arch/arm64/include/asm/dma-contiguous.h
> > +++ b/arch/arm64/include/asm/dma-contiguous.h
> > @@ -18,7 +18,6 @@
> >   #ifdef CONFIG_DMA_CMA
> >
> >   #include <linux/types.h>
> > -#include <asm-generic/dma-contiguous.h>
>
> Thanks for this.
>
> Laura, did you have additional patches adding
> asm-generic/dma-contiguous.h?

no, asm-generic/dma-contiguous.h was an old file which was later 
removed. I missed this when rebasing from my older branch to mainline.
You can have

Acked-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx>

Thanks,
Laura

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/