summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:09:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:09:41 +0100
commit2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch)
tree4aa71d7551184ee88f32c7f3660d821133058c32 /Documentation
parentMerge branch 'perf' into devel (diff)
parentARM: Eliminate decompressor -Dstatic= PIC hack (diff)
downloadlinux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.xz
linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.zip
Merge branch 'misc2' into devel
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.