diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-09-06 07:30:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-06 07:30:23 +0200 |
| commit | 9326011edfcb7f7c3ad70f8a1cde6b391604808e (patch) | |
| tree | 2bcf0a42a4a1238ff032ec1255b33171d8491867 /include/uapi | |
| parent | Merge branch 'linus' into x86/cpu, to resolve conflicts (diff) | |
| parent | x86: Correct misc typos (diff) | |
| download | linux-dev-9326011edfcb7f7c3ad70f8a1cde6b391604808e.tar.xz linux-dev-9326011edfcb7f7c3ad70f8a1cde6b391604808e.zip | |
Merge branch 'x86/cleanups' into x86/cpu, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/prctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index 094bb03b9cc2..961e0a4a0f73 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -181,7 +181,7 @@ struct prctl_mm_map { #define PR_GET_THP_DISABLE 42 /* - * Tell the kernel to start/stop helping userspace manage bounds tables. + * No longer implemented, but left here to ensure the numbers stay reserved: */ #define PR_MPX_ENABLE_MANAGEMENT 43 #define PR_MPX_DISABLE_MANAGEMENT 44 |