diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
| commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
| tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /Documentation/x86/x86_64/mm.txt | |
| parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
| parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'Documentation/x86/x86_64/mm.txt')
| -rw-r--r-- | Documentation/x86/x86_64/mm.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt index 052ee643a32e..05712ac83e38 100644 --- a/Documentation/x86/x86_64/mm.txt +++ b/Documentation/x86/x86_64/mm.txt @@ -12,6 +12,8 @@ ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB) ... unused hole ... +ffffec0000000000 - fffffc0000000000 (=44 bits) kasan shadow memory (16TB) +... unused hole ... ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks ... unused hole ... ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0 |