diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 00:00:17 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 11:27:43 +0000 |
| commit | 9eedd96301cad8ab58ee8c1e579677d0a75c2ba1 (patch) | |
| tree | 87f5ebbbd5769516771bef37574b39464177f496 /arch/arm/mach-iop13xx | |
| parent | 3d29005ab8d828e36108ecc2338612ce3acdd86f (diff) | |
| download | linux-9eedd96301cad8ab58ee8c1e579677d0a75c2ba1.tar.gz linux-9eedd96301cad8ab58ee8c1e579677d0a75c2ba1.tar.bz2 linux-9eedd96301cad8ab58ee8c1e579677d0a75c2ba1.zip | |
ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
Replace the page_to_dma() and dma_to_page() macros with their PFN
equivalents. This allows us to map parts of memory which do not have
a struct page allocated to them to bus addresses. This will be used
internally by dma_alloc_coherent()/dma_alloc_writecombine().
Build tested on Versatile, OMAP1, IOP13xx and KS8695.
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop13xx')
| -rw-r--r-- | arch/arm/mach-iop13xx/include/mach/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index 7415e4338651..3ad455318868 100644 --- a/arch/arm/mach-iop13xx/include/mach/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h @@ -58,13 +58,13 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x) __dma; \ }) -#define __arch_page_to_dma(dev, page) \ +#define __arch_pfn_to_dma(dev, pfn) \ ({ \ /* __is_lbus_virt() can never be true for RAM pages */ \ - (dma_addr_t)page_to_phys(page); \ + (dma_addr_t)__pfn_to_phys(pfn); \ }) -#define __arch_dma_to_page(dev, addr) phys_to_page(addr) +#define __arch_dma_to_pfn(dev, addr) __phys_to_pfn(addr) #endif /* CONFIG_ARCH_IOP13XX */ #endif /* !ASSEMBLY */ |