diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 10:39:02 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 10:39:02 -0500 |
| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 (patch) | |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 /arch/arm/mach-sa1100 | |
| parent | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 (diff) | |
| parent | b5ee9002583fc14e6d45a04c18f208987a8fbced (diff) | |
Merge branch 'highmem' into devel
Conflicts:
arch/arm/mach-clps7500/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index 1c127b68581d..6984034f6958 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h | |||
| @@ -28,18 +28,6 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); | |||
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | /* | 30 | /* |
| 31 | * Virtual view <-> DMA view memory address translations | ||
| 32 | * virt_to_bus: Used to translate the virtual address to an | ||
| 33 | * address suitable to be passed to set_dma_addr | ||
| 34 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 35 | * to an address that the kernel can use. | ||
| 36 | * | ||
| 37 | * On the SA1100, bus addresses are equivalent to physical addresses. | ||
| 38 | */ | ||
| 39 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 40 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 41 | |||
| 42 | /* | ||
| 43 | * Because of the wide memory address space between physical RAM banks on the | 31 | * Because of the wide memory address space between physical RAM banks on the |
| 44 | * SA1100, it's much convenient to use Linux's SparseMEM support to implement | 32 | * SA1100, it's much convenient to use Linux's SparseMEM support to implement |
| 45 | * our memory map representation. Assuming all memory nodes have equal access | 33 | * our memory map representation. Assuming all memory nodes have equal access |