aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 10:56:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 18:42:34 +0000
commitc72e005b099302b3c6bee8381396199b77b6dd4f (patch)
tree00b12648664fe10d86bcf45348cc348515a10eaa
parentb9c78022b0e65cdca2541be658f0e74138e92ffe (diff)
[ARM] fix constant values of MAX_DMA_ADDRESS
Since 8d5796d2ec6b5a4e7a52861144e63af438d6f8f7, we have allowed PAGE_OFFSET to be configurable, so a constant virtual address for MAX_DMA_ADDRESS is buggy. It should be defined in terms of PAGE_OFFSET rather than a constant virtual address. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-h720x/include/mach/memory.h2
-rw-r--r--arch/arm/mach-s3c2410/include/mach/memory.h8
-rw-r--r--arch/arm/mach-shark/include/mach/memory.h2
3 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h
index 8cfb665e04b..c9bdb21a444 100644
--- a/arch/arm/mach-h720x/include/mach/memory.h
+++ b/arch/arm/mach-h720x/include/mach/memory.h
@@ -16,6 +16,6 @@
* If you set this, you must also set ISA_DMA_THRESHOLD and setup a DMA
* zone if this does not cover all possible RAM.
*/
-#define MAX_DMA_ADDRESS 0xd0000000
+#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M)
#endif
diff --git a/arch/arm/mach-s3c2410/include/mach/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h
index 2246966bbbe..6f1e5871ae4 100644
--- a/arch/arm/mach-s3c2410/include/mach/memory.h
+++ b/arch/arm/mach-s3c2410/include/mach/memory.h
@@ -13,12 +13,4 @@
#define PHYS_OFFSET UL(0x30000000)
-/*
- * This is the maximum DMA address(physical address) that can be DMAd to.
- * Err, no, this is a virtual address. And you must set ISA_DMA_THRESHOLD
- * and setup a DMA zone if this restricts the amount of RAM which is
- * capable of DMA.
- */
-#define MAX_DMA_ADDRESS 0x40000000
-
#endif
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h
index b497a5868b0..c5ab038925d 100644
--- a/arch/arm/mach-shark/include/mach/memory.h
+++ b/arch/arm/mach-shark/include/mach/memory.h
@@ -33,7 +33,7 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
__arch_adjust_zones(node, size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1)
-#define MAX_DMA_ADDRESS 0xC0400000
+#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M)
#endif