From: Catalin Marinas Date: Tue, 9 Aug 2011 14:27:32 +0000 (+0100) Subject: ARM: LPAE: Cast the dma_addr_t argument to unsigned long in dma_to_virt X-Git-Tag: next-20110810~70^2~15 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=693656221d6506ada915e8a7e12f604806e7275c;p=karo-tx-linux.git ARM: LPAE: Cast the dma_addr_t argument to unsigned long in dma_to_virt This is to avoid a compiler warning when invoking the __bus_to_virt() macro. The dma_to_virt() function gets addresses within the 32-bit range. Signed-off-by: Catalin Marinas --- diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 7a21d0bf7134..28b7ee8d7398 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -32,7 +32,7 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) { - return (void *)__bus_to_virt(addr); + return (void *)__bus_to_virt((unsigned long)addr); } static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)