diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-04-20 08:20:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-15 10:03:01 -0400 |
commit | e8d776f20f92b9c679bcdcbdf3aee5026d5265f5 (patch) | |
tree | deef2f8f7f07bb7b87f7ce6908535db5c7294cab | |
parent | 4d3beaa06d3536aa8968d1828a66bd5ccb5036ac (diff) |
docs: x86: move two x86-specific files to x86 arch dir
Those two docs belong to the x86 architecture:
Documentation/Intel-IOMMU.txt -> Documentation/x86/intel-iommu.rst
Documentation/intel_txt.txt -> Documentation/x86/intel_txt.rst
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r-- | Documentation/x86/index.rst | 2 | ||||
-rw-r--r-- | Documentation/x86/intel-iommu.rst (renamed from Documentation/Intel-IOMMU.txt) | 0 | ||||
-rw-r--r-- | Documentation/x86/intel_txt.rst (renamed from Documentation/intel_txt.txt) | 0 | ||||
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | security/Kconfig | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst index f2de1b2d3ac7..af64c4bb4447 100644 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst | |||
@@ -20,6 +20,8 @@ x86-specific Documentation | |||
20 | mtrr | 20 | mtrr |
21 | pat | 21 | pat |
22 | intel_mpx | 22 | intel_mpx |
23 | intel-iommu | ||
24 | intel_txt | ||
23 | amd-memory-encryption | 25 | amd-memory-encryption |
24 | pti | 26 | pti |
25 | mds | 27 | mds |
diff --git a/Documentation/Intel-IOMMU.txt b/Documentation/x86/intel-iommu.rst index 9dae6b47e398..9dae6b47e398 100644 --- a/Documentation/Intel-IOMMU.txt +++ b/Documentation/x86/intel-iommu.rst | |||
diff --git a/Documentation/intel_txt.txt b/Documentation/x86/intel_txt.rst index d83c1a2122c9..d83c1a2122c9 100644 --- a/Documentation/intel_txt.txt +++ b/Documentation/x86/intel_txt.rst | |||
diff --git a/MAINTAINERS b/MAINTAINERS index 699596d931c1..f33487dabafd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -8312,7 +8312,7 @@ L: tboot-devel@lists.sourceforge.net | |||
8312 | W: http://tboot.sourceforge.net | 8312 | W: http://tboot.sourceforge.net |
8313 | T: hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot | 8313 | T: hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot |
8314 | S: Supported | 8314 | S: Supported |
8315 | F: Documentation/intel_txt.txt | 8315 | F: Documentation/x86/intel_txt.rst |
8316 | F: include/linux/tboot.h | 8316 | F: include/linux/tboot.h |
8317 | F: arch/x86/kernel/tboot.c | 8317 | F: arch/x86/kernel/tboot.c |
8318 | 8318 | ||
diff --git a/security/Kconfig b/security/Kconfig index 06a30851511a..0d65594b5196 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
@@ -121,7 +121,7 @@ config INTEL_TXT | |||
121 | See <http://www.intel.com/technology/security/> for more information | 121 | See <http://www.intel.com/technology/security/> for more information |
122 | about Intel(R) TXT. | 122 | about Intel(R) TXT. |
123 | See <http://tboot.sourceforge.net> for more information about tboot. | 123 | See <http://tboot.sourceforge.net> for more information about tboot. |
124 | See Documentation/intel_txt.txt for a description of how to enable | 124 | See Documentation/x86/intel_txt.rst for a description of how to enable |
125 | Intel TXT support in a kernel boot. | 125 | Intel TXT support in a kernel boot. |
126 | 126 | ||
127 | If you are unsure as to whether this is required, answer N. | 127 | If you are unsure as to whether this is required, answer N. |