ARM: 8023/1: remove remnants of the static DMA mapping
authorNicolas Pitre <nicolas.pitre@linaro.org>
Wed, 9 Apr 2014 20:24:02 +0000 (21:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 23 Apr 2014 00:24:33 +0000 (01:24 +0100)
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>
Documentation/arm/memory.txt
arch/arm/include/asm/memory.h

index 4bfb9ff..d74e8a5 100644 (file)
@@ -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.
 
index 02fa255..2b75146 100644 (file)
@@ -83,8 +83,6 @@
  */
 #define IOREMAP_MAX_ORDER      24
 
-#define CONSISTENT_END         (0xffe00000UL)
-
 #else /* CONFIG_MMU */
 
 /*