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-ks8695 | |
| parent | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (diff) | |
| parent | 053a96ca11a9785a7e63fc89eed4514a6446ec58 (diff) | |
| download | kernel_samsung_crespo-fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679.zip kernel_samsung_crespo-fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679.tar.gz kernel_samsung_crespo-fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679.tar.bz2 | |
Merge branch 'highmem' into devel
Diffstat (limited to 'arch/arm/mach-ks8695')
| -rw-r--r-- | arch/arm/mach-ks8695/include/mach/memory.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h index 6d5887c..76e5308 100644 --- a/arch/arm/mach-ks8695/include/mach/memory.h +++ b/arch/arm/mach-ks8695/include/mach/memory.h @@ -35,7 +35,11 @@ extern struct bus_type platform_bus_type; __phys_to_virt(x) : __bus_to_virt(x)); }) #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ (dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); }) -#define __arch_page_to_dma(dev, x) __arch_virt_to_dma(dev, page_address(x)) +#define __arch_page_to_dma(dev, x) \ + ({ dma_addr_t __dma = page_to_phys(page); \ + if (!is_lbus_device(dev)) \ + __dma = __dma - PHYS_OFFSET + KS8695_PCIMEM_PA; \ + __dma; }) #endif |