Commit 01f461a3 authored Aug 23, 2011 by Catalin Marinas Committed by Russell King Aug 23, 2011

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>

parent fcb8ce5c

arch/arm/include/asm/dma-mapping.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)