diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:09:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:09:41 -0500 |
| commit | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch) | |
| tree | 4aa71d7551184ee88f32c7f3660d821133058c32 /Documentation | |
| parent | bc85e585c6d0fab4bde12d60964b2f25802c3163 (diff) | |
| parent | 5de813b6cd06460b337f9da9afe316823cf3ef45 (diff) | |
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 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. | |||
| 59 | This maps the platforms RAM, and typically | 59 | This maps the platforms RAM, and typically |
| 60 | maps all platform RAM in a 1:1 relationship. | 60 | maps all platform RAM in a 1:1 relationship. |
| 61 | 61 | ||
| 62 | TASK_SIZE PAGE_OFFSET-1 Kernel module space | 62 | PKMAP_BASE PAGE_OFFSET-1 Permanent kernel mappings |
| 63 | One way of mapping HIGHMEM pages into kernel | ||
| 64 | space. | ||
| 65 | |||
| 66 | MODULES_VADDR MODULES_END-1 Kernel module space | ||
| 63 | Kernel modules inserted via insmod are | 67 | Kernel modules inserted via insmod are |
| 64 | placed here using dynamic mappings. | 68 | placed here using dynamic mappings. |
| 65 | 69 | ||