diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-12-17 12:48:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-12-17 12:48:25 -0500 |
| commit | 02117e42db7470e59910088b2b0ee42d581d2651 (patch) | |
| tree | 7734414b46fb72ffc708ac924f3b6b69de1f0d4c /include/uapi/linux/prctl.h | |
| parent | ba6f508d0ec4adb09f0a939af6d5e19cdfa8667d (diff) | |
| parent | 721066dfd4d5c0fee5772c777d6930d0f423b4eb (diff) | |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/prctl.h')
| -rw-r--r-- | include/uapi/linux/prctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index c0d7ea0bf5b6..b17201edfa09 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h | |||
| @@ -212,6 +212,7 @@ struct prctl_mm_map { | |||
| 212 | #define PR_SET_SPECULATION_CTRL 53 | 212 | #define PR_SET_SPECULATION_CTRL 53 |
| 213 | /* Speculation control variants */ | 213 | /* Speculation control variants */ |
| 214 | # define PR_SPEC_STORE_BYPASS 0 | 214 | # define PR_SPEC_STORE_BYPASS 0 |
| 215 | # define PR_SPEC_INDIRECT_BRANCH 1 | ||
| 215 | /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ | 216 | /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ |
| 216 | # define PR_SPEC_NOT_AFFECTED 0 | 217 | # define PR_SPEC_NOT_AFFECTED 0 |
| 217 | # define PR_SPEC_PRCTL (1UL << 0) | 218 | # define PR_SPEC_PRCTL (1UL << 0) |