diff options
-rw-r--r-- | Documentation/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/x86/00-INDEX | 4 | ||||
-rw-r--r-- | Documentation/x86/mtrr.txt (renamed from Documentation/mtrr.txt) | 4 | ||||
-rw-r--r-- | arch/x86/Kconfig | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 1977fab38656..661b6ccfe180 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
@@ -253,8 +253,6 @@ mono.txt | |||
253 | - how to execute Mono-based .NET binaries with the help of BINFMT_MISC. | 253 | - how to execute Mono-based .NET binaries with the help of BINFMT_MISC. |
254 | moxa-smartio | 254 | moxa-smartio |
255 | - file with info on installing/using Moxa multiport serial driver. | 255 | - file with info on installing/using Moxa multiport serial driver. |
256 | mtrr.txt | ||
257 | - how to use PPro Memory Type Range Registers to increase performance. | ||
258 | mutex-design.txt | 256 | mutex-design.txt |
259 | - info on the generic mutex subsystem. | 257 | - info on the generic mutex subsystem. |
260 | namespaces/ | 258 | namespaces/ |
diff --git a/Documentation/x86/00-INDEX b/Documentation/x86/00-INDEX new file mode 100644 index 000000000000..dbe3377754af --- /dev/null +++ b/Documentation/x86/00-INDEX | |||
@@ -0,0 +1,4 @@ | |||
1 | 00-INDEX | ||
2 | - this file | ||
3 | mtrr.txt | ||
4 | - how to use x86 Memory Type Range Registers to increase performance | ||
diff --git a/Documentation/mtrr.txt b/Documentation/x86/mtrr.txt index c39ac395970e..cc071dc333c2 100644 --- a/Documentation/mtrr.txt +++ b/Documentation/x86/mtrr.txt | |||
@@ -18,7 +18,7 @@ Richard Gooch | |||
18 | The AMD K6-2 (stepping 8 and above) and K6-3 processors have two | 18 | The AMD K6-2 (stepping 8 and above) and K6-3 processors have two |
19 | MTRRs. These are supported. The AMD Athlon family provide 8 Intel | 19 | MTRRs. These are supported. The AMD Athlon family provide 8 Intel |
20 | style MTRRs. | 20 | style MTRRs. |
21 | 21 | ||
22 | The Centaur C6 (WinChip) has 8 MCRs, allowing write-combining. These | 22 | The Centaur C6 (WinChip) has 8 MCRs, allowing write-combining. These |
23 | are supported. | 23 | are supported. |
24 | 24 | ||
@@ -87,7 +87,7 @@ reg00: base=0x00000000 ( 0MB), size= 64MB: write-back, count=1 | |||
87 | reg01: base=0xfb000000 (4016MB), size= 16MB: write-combining, count=1 | 87 | reg01: base=0xfb000000 (4016MB), size= 16MB: write-combining, count=1 |
88 | reg02: base=0xfb000000 (4016MB), size= 4kB: uncachable, count=1 | 88 | reg02: base=0xfb000000 (4016MB), size= 4kB: uncachable, count=1 |
89 | 89 | ||
90 | Some cards (especially Voodoo Graphics boards) need this 4 kB area | 90 | Some cards (especially Voodoo Graphics boards) need this 4 kB area |
91 | excluded from the beginning of the region because it is used for | 91 | excluded from the beginning of the region because it is used for |
92 | registers. | 92 | registers. |
93 | 93 | ||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 03980cb04291..06f935469d0b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1131,7 +1131,7 @@ config MTRR | |||
1131 | You can safely say Y even if your machine doesn't have MTRRs, you'll | 1131 | You can safely say Y even if your machine doesn't have MTRRs, you'll |
1132 | just add about 9 KB to your kernel. | 1132 | just add about 9 KB to your kernel. |
1133 | 1133 | ||
1134 | See <file:Documentation/mtrr.txt> for more information. | 1134 | See <file:Documentation/x86/mtrr.txt> for more information. |
1135 | 1135 | ||
1136 | config MTRR_SANITIZER | 1136 | config MTRR_SANITIZER |
1137 | bool | 1137 | bool |