From 932b693e90187b691d45912b773996b2dc4c77ed Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 4 Mar 2013 21:16:18 +0100 Subject: [PATCH] --- yaml --- r: 366215 b: refs/heads/master c: aca91bfc67fe356544eb1cfc483c09b27ce49fa9 h: refs/heads/master i: 366213: 552e266f843c5b87a7a2d2f7d8abb3749ab31179 366211: 3911bd17a25ba4aa34382be398ab180a149a432a 366207: 6979896acfea554cfffb8980cfc7e3fa9bc28931 v: v3 --- [refs] | 2 +- trunk/Documentation/x86/x86_64/mm.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7bbdc276e3ca..6dd4e8f9242a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e3c2a8cf647e2f3a1e9d38009b0d1c02145822f +refs/heads/master: aca91bfc67fe356544eb1cfc483c09b27ce49fa9 diff --git a/trunk/Documentation/x86/x86_64/mm.txt b/trunk/Documentation/x86/x86_64/mm.txt index d6498e3cd713..881582f75c9c 100644 --- a/trunk/Documentation/x86/x86_64/mm.txt +++ b/trunk/Documentation/x86/x86_64/mm.txt @@ -13,7 +13,9 @@ ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB) ... unused hole ... ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0 -ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space +ffffffffa0000000 - ffffffffff5fffff (=1525 MB) module mapping space +ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls +ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole The direct mapping covers all memory in the system up to the highest memory address (this means in some cases it can also include PCI memory