---

yaml --- r: 123592 b: refs/heads/master c: c72e005 h: refs/heads/master v: v3
git-mirror · Nov 29, 2008 · 8c18f5b · 8c18f5b
1 parent 259a154
commit 8c18f5b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9c78022b0e65cdca2541be658f0e74138e92ffe
+refs/heads/master: c72e005b099302b3c6bee8381396199b77b6dd4f
diff --git a/trunk/arch/arm/mach-h720x/include/mach/memory.h b/trunk/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/trunk/arch/arm/mach-s3c2410/include/mach/memory.h b/trunk/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/trunk/arch/arm/mach-shark/include/mach/memory.h b/trunk/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