diff options
| author | Catalin Marinas | 2011-08-23 14:59:14 +0200 |
|---|---|---|
| committer | Russell King | 2011-08-23 16:30:33 +0200 |
| commit | 01f461a3a4321a9f98b6b508f32d2396c5704b7c (patch) | |
| tree | ede4bd3997704d0f13ccff718208bc2a6b9b63e3 /arch/arm | |
| parent | Linux 3.1-rc3 (diff) | |
| download | kernel-qcow2-linux-01f461a3a4321a9f98b6b508f32d2396c5704b7c.tar.gz kernel-qcow2-linux-01f461a3a4321a9f98b6b508f32d2396c5704b7c.tar.xz kernel-qcow2-linux-01f461a3a4321a9f98b6b508f32d2396c5704b7c.zip | |
ARM: 7058/1: 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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |