diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-24 18:47:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:47:45 -0400 |
| commit | fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679 (patch) | |
| tree | 3a17c02aa0cf9bdbed9aa479739974aa2416ecac /arch/arm/plat-omap | |
| parent | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (diff) | |
| parent | 053a96ca11a9785a7e63fc89eed4514a6446ec58 (diff) | |
Merge branch 'highmem' into devel
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/memory.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h index d6b5ca6c7da2..99ed564d9277 100644 --- a/arch/arm/plat-omap/include/mach/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h | |||
| @@ -61,9 +61,11 @@ | |||
| 61 | #define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET) | 61 | #define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET) |
| 62 | #define is_lbus_device(dev) (cpu_is_omap15xx() && dev && (strncmp(dev_name(dev), "ohci", 4) == 0)) | 62 | #define is_lbus_device(dev) (cpu_is_omap15xx() && dev && (strncmp(dev_name(dev), "ohci", 4) == 0)) |
| 63 | 63 | ||
| 64 | #define __arch_page_to_dma(dev, page) ({is_lbus_device(dev) ? \ | 64 | #define __arch_page_to_dma(dev, page) \ |
| 65 | (dma_addr_t)virt_to_lbus(page_address(page)) : \ | 65 | ({ dma_addr_t __dma = page_to_phys(page); \ |
| 66 | (dma_addr_t)__virt_to_phys(page_address(page));}) | 66 | if (is_lbus_device(dev)) \ |
| 67 | __dma = __dma - PHYS_OFFSET + OMAP1510_LB_OFFSET; \ | ||
| 68 | __dma; }) | ||
| 67 | 69 | ||
| 68 | #define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ | 70 | #define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ |
| 69 | lbus_to_virt(addr) : \ | 71 | lbus_to_virt(addr) : \ |