aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 15:21:51 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 15:21:51 -0800
commit29ac878a71d1900cc2e283819b1daa388961ab6e (patch)
tree8756008bf1e3b07f2ab6fc6321b494a5eeee63ed /Documentation
parent54c4e6b5fee0347ab81e2c2fe4239c455c3422ae (diff)
parenta6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 (diff)
downloadkernel_samsung_aries-29ac878a71d1900cc2e283819b1daa388961ab6e.zip
kernel_samsung_aries-29ac878a71d1900cc2e283819b1daa388961ab6e.tar.gz
kernel_samsung_aries-29ac878a71d1900cc2e283819b1daa388961ab6e.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 4b1c93a..dc60455 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