From: Grygorii Strashko <[email protected]> Commit 364230b9 "ARM: use phys_addr_t for DMA zone sizes" changes type of arm_dma_zone_size to phys_addr_t, but misses to update external definition of it in in arch/arm/include/asm/dma.h. As result, kernel build is failed if CONFIG_ZONE_DMA is enabled:
arch/arm/mm/init.c:202:13: error: conflicting types for 'arm_dma_zone_size' include/linux/bootmem.h:258:66: note: previous declaration of 'arm_dma_zone_size' was here Hence, fix external definition of arm_dma_zone_size. Cc: Russell King <[email protected]> Cc: Rob Herring <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Grygorii Strashko <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> --- arch/arm/include/asm/dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 58b8c6a..1439b80 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -8,7 +8,7 @@ #define MAX_DMA_ADDRESS 0xffffffffUL #else #define MAX_DMA_ADDRESS ({ \ - extern unsigned long arm_dma_zone_size; \ + extern phys_addr_t arm_dma_zone_size; \ arm_dma_zone_size ? \ (PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; }) #endif -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
