diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-17 20:05:50 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-17 20:05:50 -0800 |
| commit | d695cfa54e9ec48aeb149cadc8dab1240751572a (patch) | |
| tree | 503d342f303181c4a8e4fb89e070117d5760c513 /Documentation/arm/memory.txt | |
| parent | c3e00a0eff4c05717915ac7a8e4646db3882aebf (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
| download | op-kernel-dev-d695cfa54e9ec48aeb149cadc8dab1240751572a.zip op-kernel-dev-d695cfa54e9ec48aeb149cadc8dab1240751572a.tar.gz | |
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/arm/memory.txt')
| -rw-r--r-- | Documentation/arm/memory.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt index 771d48d..208a2d4 100644 --- a/Documentation/arm/memory.txt +++ b/Documentation/arm/memory.txt @@ -51,15 +51,14 @@ ffc00000 ffefffff DMA memory mapping region. Memory returned 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 be dynamically placed in this region. - VMALLOC_START may be based upon the value - of the high_memory variable. + Machine specific static mappings are also + located here through iotable_init(). + VMALLOC_START is based upon the value + of the high_memory variable, and VMALLOC_END + is equal to 0xff000000. PAGE_OFFSET high_memory-1 Kernel direct-mapped RAM region. This maps the platforms RAM, and typically |
