summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-20 09:05:35 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-20 09:05:35 +0300
commit4af452bd03ec73efb1d3bf560d6d22b12d96752e (patch)
tree25b79c5aa3f35da523b4a1f89e7734070a8931ce /Documentation
parent625876f32ed63af262db3d0ac8178d2c0f510636 (diff)
parent3bedff1d73b86e0cf52634efb447e9ada08f2cc6 (diff)
downloadlinux-4af452bd03ec73efb1d3bf560d6d22b12d96752e.tar.xz
Merge branch 'master'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/memory.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 4b1c93a8177b..dc6045577a8b 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -1,7 +1,7 @@
Kernel Memory Layout on ARM Linux
Russell King <rmk@arm.linux.org.uk>
- May 21, 2004 (2.6.6)
+ November 17, 2005 (2.6.15)
This document describes the virtual memory layout which the Linux
kernel uses for ARM processors. It indicates which regions are
@@ -37,6 +37,8 @@ ff000000 ffbfffff Reserved for future expansion of DMA
mapping region.
VMALLOC_END feffffff Free for platform use, recommended.
+ VMALLOC_END must be aligned to a 2MB
+ boundary.
VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space.
Memory returned by vmalloc/ioremap will