Skip to content

Commit

Permalink
ARM: 8023/1: remove remnants of the static DMA mapping
Browse files Browse the repository at this point in the history
It looks like the static mapping area for DMA was replaced by dynamic
allocation into the vmalloc area by commit e9da6e9 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>
  • Loading branch information
Nicolas Pitre authored and Russell King committed Apr 23, 2014
1 parent a672917 commit 64d3b6a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
7 changes: 0 additions & 7 deletions Documentation/arm/memory.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 0 additions & 2 deletions arch/arm/include/asm/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@
*/
#define IOREMAP_MAX_ORDER 24

#define CONSISTENT_END (0xffe00000UL)

#else /* CONFIG_MMU */

/*
Expand Down

0 comments on commit 64d3b6a

Please sign in to comment.