aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2014-04-09 21:24:02 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-04-23 01:24:33 +0100
commit64d3b6a3f480154b6727dd2187f5f2b58c15da77 (patch)
tree96bc428b41e7ae19e68529b54089044cc635ca1e
parentARM: 8022/1: ftrace: work with CONFIG_DEBUG_SET_MODULE_RONX (diff)
downloadlinux-dev-64d3b6a3f480154b6727dd2187f5f2b58c15da77.tar.xz
linux-dev-64d3b6a3f480154b6727dd2187f5f2b58c15da77.zip
ARM: 8023/1: remove remnants of the static DMA mapping
It looks like the static mapping area for DMA was replaced by dynamic allocation into the vmalloc area by commit e9da6e9905e6 but the information in Documentation/arm/memory.txt was not removed accordingly. CONSISTENT_END in arch/arm/include/asm/memory.h has no more users and can be removed as well. Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--Documentation/arm/memory.txt7
-rw-r--r--arch/arm/include/asm/memory.h2
2 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 4bfb9ffbdbc1..d74e8a5901fc 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -44,13 +44,6 @@ fffe0000 fffe7fff ITCM mapping area for platforms with
fff00000 fffdffff Fixmap mapping region. Addresses provided
by fix_to_virt() will be located here.
-ffc00000 ffefffff DMA memory mapping region. Memory returned
- by the dma_alloc_xxx functions will be
- dynamically mapped here.
-
-ff000000 ffbfffff Reserved for future expansion of DMA
- mapping region.
-
fee00000 feffffff Mapping of PCI I/O space. This is a static
mapping within the vmalloc space.
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 02fa2558f662..2b751464d6ff 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -83,8 +83,6 @@
*/
#define IOREMAP_MAX_ORDER 24
-#define CONSISTENT_END (0xffe00000UL)
-
#else /* CONFIG_MMU */
/*