[PATCH] Documentation:Update Documentation/zh_CN/arm64/memory.txt

[wefu]

From: Fu Wei <wefu@xxxxxxxxxx>

This is a update of Chinese documentation:Documentation/zh_CN/arm64/memory.txt

It is based on the modifications of Documentation/arm64/memory.txt in submission:
"08375198", "4edae01e", "a24637d5", "383c2799".

Signed-off-by: Fu Wei <wefu@xxxxxxxxxx>
---
 Documentation/zh_CN/arm64/memory.txt | 65 +++++++++++++++---------------------
 1 file changed, 26 insertions(+), 39 deletions(-)

diff --git a/Documentation/zh_CN/arm64/memory.txt b/Documentation/zh_CN/arm64/memory.txt
index a782704..19b3a52 100644
--- a/Documentation/zh_CN/arm64/memory.txt
+++ b/Documentation/zh_CN/arm64/memory.txt
@@ -15,6 +15,8 @@ Documentation/arm64/memory.txt çäæçè
 äææåéçèïäåäåäæççæèæåãåææçèææäåææèç
 èååééïèèçäæççæèã
 
+ææçèæäæç Git æåçäï bc465aa9d045feb0e13b4a8f32cc33c1943f62d6
+
 èæççæèï Catalin Marinas <catalin.marinas@xxxxxxx>
 äæççæèï åç  Fu Wei <wefu@xxxxxxxxxx>
 äæççèèï åç  Fu Wei <wefu@xxxxxxxxxx>
@@ -26,69 +28,53 @@ Documentation/arm64/memory.txt çäæçè
 		     ===========================
 
 äè: Catalin Marinas <catalin.marinas@xxxxxxx>
-ææ: 2012 å 02 æ 20 æ
 
 ææææè AArch64 Linux åææäççèæååååãæææåäåç
 éååä 4KB ç 4 çèæèåéååä 64KB ç 3 çèæèã
 
-AArch64 Linux äçéååä 4KB ç 3 çèæèéçïåäçæååæ
-éæ 39-bit (512GB) çèæååçéãåäéååä 64KBçéçïä
-äç 2 çèæèïäååååçåã
+AArch64 Linux äç 3 çæ 4 çèæèïåéååéçä 4KBïåäçæååæ
+ååéæ 39-bit (512GB) æ 48-bit (256TB) çèæååçéã
+åäéååä 64KBçéçïääç 2 çèæèïæ 42-bit (4TB) çèæååçéïäååååçåã
 
-çæååçéç 63:39 ää 0ïèåæååçéççåää 1ãTTBRx ç
+çæååçéç 63:48 ää 0ïèåæååçéççåää 1ãTTBRx ç
 éæçèæååç 63 äçåãswapper_pg_dir äåååæïååïæåï
-èçæ pgd äååçæïéååïæåãswapper_pgd_dir ååèåå
+èçæ pgd äååçæïéååïæåãswapper_pg_dir ååèåå
 TTBR1 äïäääåå TTBR0ã
 
 
-AArch64 Linux åéååä 4KB æçååååï
+AArch64 Linux åéååä 4KBïåäç 3 çèæèæçååååï
 
 èååå			çæåå			åå		çé
 -----------------------------------------------------------------------
 0000000000000000	0000007fffffffff	 512GB		çæçé
+ffffff8000000000	ffffffffffffffff	 512GB		åæçé
 
-ffffff8000000000	ffffffbbfffeffff	~240GB		vmalloc
-
-ffffffbbffff0000	ffffffbbffffffff	  64KB		[éæé]
-
-ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap
-
-ffffffbe00000000	ffffffbffbbfffff	  ~8GB		[éæéïææçä vmmemap]
 
-ffffffbffbc00000	ffffffbffbdfffff	   2MB		earlyprintk èå
+AArch64 Linux åéååä 4KBïåäç 4 çèæèæçååååï
 
-ffffffbffbe00000	ffffffbffbe0ffff	  64KB		PCI I/O çé
-
-ffffffbffbe10000	ffffffbcffffffff	  ~2MB		[éæé]
-
-ffffffbffc000000	ffffffbfffffffff	  64MB		æå
-
-ffffffc000000000	ffffffffffffffff	 256GB		åæéèååæå
+èååå			çæåå			åå		çé
+-----------------------------------------------------------------------
+0000000000000000	0000ffffffffffff	 256TB		çæçé
+ffff000000000000	ffffffffffffffff	 256TB		åæçé
 
 
-AArch64 Linux åéååä 64KB æçååååï
+AArch64 Linux åéååä 64KBïåäç 2 çèæèæçååååï
 
 èååå			çæåå			åå		çé
 -----------------------------------------------------------------------
 0000000000000000	000003ffffffffff	   4TB		çæçé
+fffffc0000000000	ffffffffffffffff	   4TB		åæçé
 
-fffffc0000000000	fffffdfbfffeffff	  ~2TB		vmalloc
-
-fffffdfbffff0000	fffffdfbffffffff	  64KB		[éæé]
-
-fffffdfc00000000	fffffdfdffffffff	   8GB		vmemmap
-
-fffffdfe00000000	fffffdfffbbfffff	  ~8GB		[éæéïææçä vmmemap]
 
-fffffdfffbc00000	fffffdfffbdfffff	   2MB		earlyprintk èå
+AArch64 Linux åéååä 64KBïåäç 3 çèæèæçååååï
 
-fffffdfffbe00000	fffffdfffbe0ffff	  64KB		PCI I/O çé
-
-fffffdfffbe10000	fffffdfffbffffff	  ~2MB		[éæé]
+èååå			çæåå			åå		çé
+-----------------------------------------------------------------------
+0000000000000000	0000ffffffffffff	 256TB		çæçé
+ffff000000000000	ffffffffffffffff	 256TB		åæçé
 
-fffffdfffc000000	fffffdffffffffff	  64MB		æå
 
-fffffe0000000000	ffffffffffffffff	   2TB		åæéèååæå
+æèççåæèæååååïèåéåæååäæã
 
 
 4KB éååçèæèææï
@@ -102,7 +88,7 @@ fffffe0000000000	ffffffffffffffff	   2TB		åæéèååæå
  |                 |         |         |         +-> [20:12] L3 çå
  |                 |         |         +-----------> [29:21] L2 çå
  |                 |         +---------------------> [38:30] L1 çå
- |                 +-------------------------------> [47:39] L0 çå (æäç)
+ |                 +-------------------------------> [47:39] L0 çå
  +-------------------------------------------------> [63] TTBR0/1
 
 
@@ -115,10 +101,11 @@ fffffe0000000000	ffffffffffffffff	   2TB		åæéèååæå
  |                 |    |               |              v
  |                 |    |               |            [15:0]  éååç
  |                 |    |               +----------> [28:16] L3 çå
- |                 |    +--------------------------> [41:29] L2 çå (ääç 38:29 )
- |                 +-------------------------------> [47:42] L1 çå (æäç)
+ |                 |    +--------------------------> [41:29] L2 çå
+ |                 +-------------------------------> [47:42] L1 çå
  +-------------------------------------------------> [63] TTBR0/1
 
+
 åäç KVM æ, çççåïhypervisorïå EL2 äéèçååæèæååç
 ääåååçææååæéïåæèæååçé 24 äèäéï:
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/