From 1496d444724349c2fcb83d2e80bc86d6df078332 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat, 26 Jul 2008 17:54:22 -0700
Subject: [PATCH] --- yaml --- r: 110400 b: refs/heads/master c:
 7225e75144b9718cbbe1820d9c011c809d5773fd h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/Documentation/00-INDEX           | 2 --
 trunk/Documentation/x86/00-INDEX       | 4 ++++
 trunk/Documentation/{ => x86}/mtrr.txt | 4 ++--
 trunk/arch/x86/Kconfig                 | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 trunk/Documentation/x86/00-INDEX
 rename trunk/Documentation/{ => x86}/mtrr.txt (99%)

diff --git a/[refs] b/[refs]
index 9e94e55ff42f..07848259ae58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a021e5124a6c57325ffb02a60cd1d5f40342f8aa
+refs/heads/master: 7225e75144b9718cbbe1820d9c011c809d5773fd
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
index 1977fab38656..661b6ccfe180 100644
--- a/trunk/Documentation/00-INDEX
+++ b/trunk/Documentation/00-INDEX
@@ -253,8 +253,6 @@ mono.txt
 	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
 moxa-smartio
 	- file with info on installing/using Moxa multiport serial driver.
-mtrr.txt
-	- how to use PPro Memory Type Range Registers to increase performance.
 mutex-design.txt
 	- info on the generic mutex subsystem.
 namespaces/
diff --git a/trunk/Documentation/x86/00-INDEX b/trunk/Documentation/x86/00-INDEX
new file mode 100644
index 000000000000..dbe3377754af
--- /dev/null
+++ b/trunk/Documentation/x86/00-INDEX
@@ -0,0 +1,4 @@
+00-INDEX
+	- this file
+mtrr.txt
+	- how to use x86 Memory Type Range Registers to increase performance
diff --git a/trunk/Documentation/mtrr.txt b/trunk/Documentation/x86/mtrr.txt
similarity index 99%
rename from trunk/Documentation/mtrr.txt
rename to trunk/Documentation/x86/mtrr.txt
index c39ac395970e..cc071dc333c2 100644
--- a/trunk/Documentation/mtrr.txt
+++ b/trunk/Documentation/x86/mtrr.txt
@@ -18,7 +18,7 @@ Richard Gooch
   The AMD K6-2 (stepping 8 and above) and K6-3 processors have two
   MTRRs. These are supported.  The AMD Athlon family provide 8 Intel
   style MTRRs.
-  
+
   The Centaur C6 (WinChip) has 8 MCRs, allowing write-combining. These
   are supported.
 
@@ -87,7 +87,7 @@ reg00: base=0x00000000 (   0MB), size=  64MB: write-back, count=1
 reg01: base=0xfb000000 (4016MB), size=  16MB: write-combining, count=1
 reg02: base=0xfb000000 (4016MB), size=   4kB: uncachable, count=1
 
-Some cards (especially Voodoo Graphics boards) need this 4 kB area 
+Some cards (especially Voodoo Graphics boards) need this 4 kB area
 excluded from the beginning of the region because it is used for
 registers.
 
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 03980cb04291..06f935469d0b 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1131,7 +1131,7 @@ config MTRR
 	  You can safely say Y even if your machine doesn't have MTRRs, you'll
 	  just add about 9 KB to your kernel.
 
-	  See <file:Documentation/mtrr.txt> for more information.
+	  See <file:Documentation/x86/mtrr.txt> for more information.
 
 config MTRR_SANITIZER
 	bool