]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: LPAE: Cast the dma_addr_t argument to unsigned long in dma_to_virt
authorCatalin Marinas <catalin.marinas@arm.com>
Tue, 9 Aug 2011 14:27:32 +0000 (15:27 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 20 Sep 2011 13:17:39 +0000 (14:17 +0100)
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 <catalin.marinas@arm.com>
arch/arm/include/asm/dma-mapping.h

index 7a21d0bf7134d2ec16b8afeb87ea1c184ee2f717..28b7ee8d7398a29c0187d6d2de59d7168c8110e5 100644 (file)
@@ -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)