diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-06-07 14:54:31 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2019-06-08 15:42:12 -0400 |
commit | 1eecbcdca2bd8d96881cace19ad105dc0f0263f5 (patch) | |
tree | 140b9ff6a7904de5a645e9269a0c4127fcd74367 | |
parent | 14b767430a58046bfef8ff9b9f12854e20343092 (diff) |
docs: move protection-keys.rst to the core-api book
This document is used by multiple architectures:
$ echo $(git grep -l pkey_mprotect arch|cut -d'/' -f 2|sort|uniq)
alpha arm arm64 ia64 m68k microblaze mips parisc powerpc s390 sh sparc x86 xtensa
So, let's move it to the core book and adjust the links to it
accordingly.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r-- | Documentation/core-api/index.rst | 1 | ||||
-rw-r--r-- | Documentation/core-api/protection-keys.rst (renamed from Documentation/x86/protection-keys.rst) | 0 | ||||
-rw-r--r-- | Documentation/x86/index.rst | 1 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/Kconfig | 2 | ||||
-rw-r--r-- | tools/testing/selftests/x86/protection_keys.c | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst index ee1bb8983a88..2466a4c51031 100644 --- a/Documentation/core-api/index.rst +++ b/Documentation/core-api/index.rst | |||
@@ -34,6 +34,7 @@ Core utilities | |||
34 | timekeeping | 34 | timekeeping |
35 | boot-time-mm | 35 | boot-time-mm |
36 | memory-hotplug | 36 | memory-hotplug |
37 | protection-keys | ||
37 | 38 | ||
38 | 39 | ||
39 | Interfaces for kernel debugging | 40 | Interfaces for kernel debugging |
diff --git a/Documentation/x86/protection-keys.rst b/Documentation/core-api/protection-keys.rst index 49d9833af871..49d9833af871 100644 --- a/Documentation/x86/protection-keys.rst +++ b/Documentation/core-api/protection-keys.rst | |||
diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst index ae36fc5fc649..f2de1b2d3ac7 100644 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst | |||
@@ -19,7 +19,6 @@ x86-specific Documentation | |||
19 | tlb | 19 | tlb |
20 | mtrr | 20 | mtrr |
21 | pat | 21 | pat |
22 | protection-keys | ||
23 | intel_mpx | 22 | intel_mpx |
24 | amd-memory-encryption | 23 | amd-memory-encryption |
25 | pti | 24 | pti |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8c1c636308c8..3b795a0cab62 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -898,7 +898,7 @@ config PPC_MEM_KEYS | |||
898 | page-based protections, but without requiring modification of the | 898 | page-based protections, but without requiring modification of the |
899 | page tables when an application changes protection domains. | 899 | page tables when an application changes protection domains. |
900 | 900 | ||
901 | For details, see Documentation/vm/protection-keys.rst | 901 | For details, see Documentation/core-api/protection-keys.rst |
902 | 902 | ||
903 | If unsure, say y. | 903 | If unsure, say y. |
904 | 904 | ||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2bbbd4d1ba31..d87d53fcd261 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1911,7 +1911,7 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS | |||
1911 | page-based protections, but without requiring modification of the | 1911 | page-based protections, but without requiring modification of the |
1912 | page tables when an application changes protection domains. | 1912 | page tables when an application changes protection domains. |
1913 | 1913 | ||
1914 | For details, see Documentation/x86/protection-keys.txt | 1914 | For details, see Documentation/core-api/protection-keys.rst |
1915 | 1915 | ||
1916 | If unsure, say y. | 1916 | If unsure, say y. |
1917 | 1917 | ||
diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c index 5d546dcdbc80..480995bceefa 100644 --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c | |||
@@ -1,6 +1,6 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
2 | /* | 2 | /* |
3 | * Tests x86 Memory Protection Keys (see Documentation/x86/protection-keys.txt) | 3 | * Tests x86 Memory Protection Keys (see Documentation/core-api/protection-keys.rst) |
4 | * | 4 | * |
5 | * There are examples in here of: | 5 | * There are examples in here of: |
6 | * * how to set protection keys on memory | 6 | * * how to set protection keys on memory |