diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-24 22:47:45 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 22:47:45 +0000 |
| commit | fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679 (patch) | |
| tree | 3a17c02aa0cf9bdbed9aa479739974aa2416ecac /arch/arm/mach-iop13xx | |
| parent | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (diff) | |
| parent | 053a96ca11a9785a7e63fc89eed4514a6446ec58 (diff) | |
| download | linux-fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679.tar.gz linux-fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679.tar.bz2 linux-fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679.zip | |
Merge branch 'highmem' into devel
Diffstat (limited to 'arch/arm/mach-iop13xx')
| -rw-r--r-- | arch/arm/mach-iop13xx/include/mach/memory.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index e012bf13c955..42ae29b288a1 100644 --- a/arch/arm/mach-iop13xx/include/mach/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h @@ -59,7 +59,10 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x) }) #define __arch_page_to_dma(dev, page) \ - __arch_virt_to_dma(dev, page_address(page)) + ({ \ + /* __is_lbus_virt() can never be true for RAM pages */ \ + (dma_addr_t)page_to_phys(page); \ + }) #endif /* CONFIG_ARCH_IOP13XX */ #endif /* !ASSEMBLY */ |