summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2019-05-09 10:44:09 +1000
committerJonathan Corbet <corbet@lwn.net>2019-05-10 09:17:54 -0600
commit730dae8e8aa29fe5f1d0394cd27b6c1239507f96 (patch)
tree5c3de9e35b3744b2a67d5d419bb4c5302b77daf4
parentc85c1c6be4e38da0c7690b99afca1a1891b3c695 (diff)
downloadlwn-730dae8e8aa29fe5f1d0394cd27b6c1239507f96.tar.gz
lwn-730dae8e8aa29fe5f1d0394cd27b6c1239507f96.zip
Documentation/x86: Carry over memory-map fix from mm.txtdocs-5.2a-merge
Commit 89502a019790 (x86/mm: Fix the 56-bit addresses memory map in Documentation/x86/x86_64/mm.txt) was lost in the RST conversion of mm.txt, so put it back. Originally-by: Stephen Kitt <steve@sk2.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/x86/x86_64/mm.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/x86/x86_64/mm.rst b/Documentation/x86/x86_64/mm.rst
index 52020577b8de..267fc4808945 100644
--- a/Documentation/x86/x86_64/mm.rst
+++ b/Documentation/x86/x86_64/mm.rst
@@ -78,7 +78,7 @@ Complete virtual memory map with 5-level page tables
.. note::
- With 56-bit addresses, user-space memory gets expanded by a factor of 512x,
- from 0.125 PB to 64 PB. All kernel mappings shift down to the -64 PT starting
+ from 0.125 PB to 64 PB. All kernel mappings shift down to the -64 PB starting
offset and many of the regions expand to support the much larger physical
memory supported.
@@ -91,7 +91,7 @@ Complete virtual memory map with 5-level page tables
0000000000000000 | 0 | 00ffffffffffffff | 64 PB | user-space virtual memory, different per mm
__________________|____________|__________________|_________|___________________________________________________________
| | | |
- 0000800000000000 | +64 PB | ffff7fffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical
+ 0100000000000000 | +64 PB | feffffffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical
| | | | virtual memory addresses up to the -64 PB
| | | | starting offset of kernel mappings.
__________________|____________|__________________|_________|___________________________________________________________
@@ -107,7 +107,7 @@ Complete virtual memory map with 5-level page tables
ffd2000000000000 | -11.5 PB | ffd3ffffffffffff | 0.5 PB | ... unused hole
ffd4000000000000 | -11 PB | ffd5ffffffffffff | 0.5 PB | virtual memory map (vmemmap_base)
ffd6000000000000 | -10.5 PB | ffdeffffffffffff | 2.25 PB | ... unused hole
- ffdf000000000000 | -8.25 PB | fffffdffffffffff | ~8 PB | KASAN shadow memory
+ ffdf000000000000 | -8.25 PB | fffffbffffffffff | ~8 PB | KASAN shadow memory
__________________|____________|__________________|_________|____________________________________________________________
|
| Identical layout to the 47-bit one from here on: