Skip to content

Commit 2c3ef25

Browse files
committed
tools headers UAPI: Sync linux/prctl.h with the kernel sources
To pick the changes in: 433c38f ("arm64: mte: change ASYNC and SYNC TCF settings into bitfields") e893bb1 ("x86, prctl: Hook L1D flushing in via prctl") That don't result in any changes in tooling: $ tools/perf/trace/beauty/prctl_option.sh > before $ cp include/uapi/linux/prctl.h tools/include/uapi/linux/prctl.h $ tools/perf/trace/beauty/prctl_option.sh > after $ diff -u before after $ Just silences this perf tools build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/prctl.h' differs from latest version at 'include/uapi/linux/prctl.h' diff -u tools/include/uapi/linux/prctl.h include/uapi/linux/prctl.h Cc: Balbir Singh <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Peter Collingbourne <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent f9f018e commit 2c3ef25

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

tools/include/uapi/linux/prctl.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ struct prctl_mm_map {
213213
/* Speculation control variants */
214214
# define PR_SPEC_STORE_BYPASS 0
215215
# define PR_SPEC_INDIRECT_BRANCH 1
216+
# define PR_SPEC_L1D_FLUSH 2
216217
/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
217218
# define PR_SPEC_NOT_AFFECTED 0
218219
# define PR_SPEC_PRCTL (1UL << 0)
@@ -234,14 +235,15 @@ struct prctl_mm_map {
234235
#define PR_GET_TAGGED_ADDR_CTRL 56
235236
# define PR_TAGGED_ADDR_ENABLE (1UL << 0)
236237
/* MTE tag check fault modes */
237-
# define PR_MTE_TCF_SHIFT 1
238-
# define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
239-
# define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
240-
# define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
241-
# define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
238+
# define PR_MTE_TCF_NONE 0
239+
# define PR_MTE_TCF_SYNC (1UL << 1)
240+
# define PR_MTE_TCF_ASYNC (1UL << 2)
241+
# define PR_MTE_TCF_MASK (PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC)
242242
/* MTE tag inclusion mask */
243243
# define PR_MTE_TAG_SHIFT 3
244244
# define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
245+
/* Unused; kept only for source compatibility */
246+
# define PR_MTE_TCF_SHIFT 1
245247

246248
/* Control reclaim behavior when allocating memory */
247249
#define PR_SET_IO_FLUSHER 57

0 commit comments

Comments
 (0)