diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-06 09:49:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-06 09:49:28 +0100 |
| commit | 75ec4eb3dc84ee78533bd59bbb71992187bd86fd (patch) | |
| tree | b75afe1763e5a21bfe508301562c037fbae2b04d /Documentation/x86 | |
| parent | 19c5787a5ff88a959e5854ab6ddef7f5777c5837 (diff) | |
| parent | 15670bfe19905b1dcbb63137f40d718b59d84479 (diff) | |
| download | linux-75ec4eb3dc84ee78533bd59bbb71992187bd86fd.tar.gz linux-75ec4eb3dc84ee78533bd59bbb71992187bd86fd.tar.bz2 linux-75ec4eb3dc84ee78533bd59bbb71992187bd86fd.zip | |
Merge branch 'x86/mm' into x86/asm, to pick up pending changes
Concentrate x86 MM and asm related changes into a single super-topic,
in preparation for larger changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/x86_64/mm.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt index b0798e281aa6..3448e675b462 100644 --- a/Documentation/x86/x86_64/mm.txt +++ b/Documentation/x86/x86_64/mm.txt @@ -34,7 +34,7 @@ ff92000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB) ... unused hole ... -ffd8000000000000 - fff7ffffffffffff (=53 bits) kasan shadow memory (8PB) +ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB) ... unused hole ... ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks ... unused hole ... |