diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:41 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:41 +0000 |
| commit | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch) | |
| tree | 4aa71d7551184ee88f32c7f3660d821133058c32 /Documentation | |
| parent | bc85e585c6d0fab4bde12d60964b2f25802c3163 (diff) | |
| parent | 5de813b6cd06460b337f9da9afe316823cf3ef45 (diff) | |
| download | linux-3.10-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.gz linux-3.10-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.bz2 linux-3.10-2741ecb4ce5c2d430b5c44b0a169038338c21df5.zip | |
Merge branch 'misc2' into devel
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arm/memory.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt index 9d58c7c5edd..eb0fae18ffb 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. |