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>

diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 4bfb9ffbdbc1d2b389025c9c0e5d9c5402a36a29..d74e8a5901fc641955191593134130853f5e21bf 100644 (file)
--- 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 02fa2558f6626a71e6132844986776c46581388f..2b751464d6ff1936bc9b73e2aaeec0a707420aaf 100644 (file)
--- 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 */
 
 /*