Re: linux-next: Tree for Jul 2

[Will Deacon]

[+Joerg]

On Tue, Jul 02, 2019 at 06:40:45PM +0800, Zhangshaokun wrote:
> +Cc: Will Deacon
> 
> There is a compiler failure on arm64 platform, as follow:
> In file included from ./include/linux/list.h:9:0,
>                  from ./include/linux/kobject.h:19,
>                  from ./include/linux/of.h:17,
>                  from ./include/linux/irqdomain.h:35,
>                  from ./include/linux/acpi.h:13,
>                  from drivers/iommu/arm-smmu-v3.c:12:
> drivers/iommu/arm-smmu-v3.c: In function âarm_smmu_device_hw_probeâ:
> drivers/iommu/arm-smmu-v3.c:194:40: error: âCONFIG_CMA_ALIGNMENTâ undeclared (first use in this function)
>  #define Q_MAX_SZ_SHIFT   (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT)
>                                         ^
> It's the commit <d25f6ead162e> ("iommu/arm-smmu-v3: Increase maximum size of queues")

Thanks for the report. I've provided a fix below.

Joerg -- please can you take this on top of the SMMUv3 patches queued
for 5.3?

Cheers,

Will

--->8