diff options
| author | Jing Peng <pj.hades@gmail.com> | 2020-10-24 18:18:13 -0400 |
|---|---|---|
| committer | Michael Kerrisk <mtk.manpages@gmail.com> | 2020-10-25 09:47:47 +0100 |
| commit | 9ae9894c8e744418eb65f0157155712a5bd26694 (patch) | |
| tree | 6e0421bc49f4100006c1e934cc86af88cd4b4940 | |
| parent | 8fe75257c6614b86cc3f57600de2fa46508b8eae (diff) | |
| download | man-pages-9ae9894c8e744418eb65f0157155712a5bd26694.tar.gz | |
proc.5: wfix
In the section for /proc/[pid]/smaps, the description of field
ProtectionKey occurs twice: both before and after the description of
VmFlags.
Changes made by this patch:
1) Only the first occurrence is kept because its order matches the
output of /proc/[pid]/smaps.
2) The kernel version that CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS was
introduced is only mentioned in the second occurrence. Now it's moved
to the first one.
Signed-off-by: Jing Peng <pj.hades@gmail.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
| -rw-r--r-- | man5/proc.5 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/man5/proc.5 b/man5/proc.5 index ed309380b5..ac58c789a3 100644 --- a/man5/proc.5 +++ b/man5/proc.5 @@ -1987,7 +1987,7 @@ contains the memory protection key (see associated with the virtual memory area. This entry is present only if the kernel was built with the .B CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS -configuration option. +configuration option (since Linux 4.6). .IP The "VmFlags" line (available since Linux 3.8) represents the kernel flags associated with the virtual memory area, @@ -2026,13 +2026,6 @@ encoded using the following two-letter codes: um - userfaultfd missing pages tracking (since Linux 4.3) uw - userfaultfd wprotect pages tracking (since Linux 4.3) .IP -"ProtectionKey" field contains the memory protection key (see -.BR pkeys (7)) -associated with the virtual memory area. -Present only if the kernel was built with the -.B CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS -configuration option. (since Linux 4.6) -.IP The .IR /proc/[pid]/smaps file is present only if the |