summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/memory.h
diff options
context:
space:
mode:
authorKevin Hilman <kevin@hilman.org>2006-01-12 17:12:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-12 17:12:21 +0100
commit37134cd55d57e95d3f606c6f2a57fa496bdad333 (patch)
tree0c5c3bb4a52550613eb5f171c5954725b51a1915 /include/asm-arm/memory.h
parent[ARM] 3252/1: help gcc do the best with ___arch__swab32 (diff)
downloadlinux-37134cd55d57e95d3f606c6f2a57fa496bdad333.tar.xz
linux-37134cd55d57e95d3f606c6f2a57fa496bdad333.zip
[ARM] 3209/1: Configurable DMA-consistent memory region
Patch from Kevin Hilman This patch increase available DMA-consistent memory allocated by dma_coherent_alloc(). The default remains at 2M (defined in asm/memory.h) and each platform has the ability to override in asm/arch-foo/memory.h. Signed-off-by: Kevin Hilman <kevin@hilman.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/memory.h')
-rw-r--r--include/asm-arm/memory.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 3d7f08bd9030..b4e1146ab682 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -25,6 +25,7 @@
#include <linux/config.h>
#include <linux/compiler.h>
#include <asm/arch/memory.h>
+#include <asm/sizes.h>
#ifndef TASK_SIZE
/*
@@ -48,6 +49,14 @@
#endif
/*
+ * Size of DMA-consistent memory region. Must be multiple of 2M,
+ * between 2MB and 14MB inclusive.
+ */
+#ifndef CONSISTENT_DMA_SIZE
+#define CONSISTENT_DMA_SIZE SZ_2M
+#endif
+
+/*
* Physical vs virtual RAM address space conversion. These are
* private definitions which should NOT be used outside memory.h
* files. Use virt_to_phys/phys_to_virt/__pa/__va instead.