summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorFenkart/Bostandzhyan <andreas.fenkart@streamunlimited.com>2010-02-07 21:48:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-15 22:40:33 +0100
commit18fe1cad889fe6c1acbf4dfc576e82a13cf1a30c (patch)
tree8e79c01429fcaef30fc63726eb3d140e56340800 /Documentation
parentARM: 5929/1: Add checks to detect overlap of memory regions. (diff)
downloadlinux-18fe1cad889fe6c1acbf4dfc576e82a13cf1a30c.tar.xz
linux-18fe1cad889fe6c1acbf4dfc576e82a13cf1a30c.zip
ARM: 5930/1: Add PKMAP area description to memory.txt.
Also adapts delimiters of neighbouring modules area. Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/memory.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 9d58c7c5eddd..eb0fae18ffb1 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -59,7 +59,11 @@ PAGE_OFFSET high_memory-1 Kernel direct-mapped RAM region.
This maps the platforms RAM, and typically
maps all platform RAM in a 1:1 relationship.
-TASK_SIZE PAGE_OFFSET-1 Kernel module space
+PKMAP_BASE PAGE_OFFSET-1 Permanent kernel mappings
+ One way of mapping HIGHMEM pages into kernel
+ space.
+
+MODULES_VADDR MODULES_END-1 Kernel module space
Kernel modules inserted via insmod are
placed here using dynamic mappings.