diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-22 12:45:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-22 12:45:11 +0200 |
| commit | 2b32769700f857a8e608a8ee24080833889965b9 (patch) | |
| tree | 8ec5ca44c2bbf6800732b65c7dc0a88a129e44c0 /tools/include | |
| parent | 351a1f5c8afa13ea5cfcdae543f6596ef8ebdbd9 (diff) | |
| parent | 9f014e3a66bc936412b6614304a4e6c70c70230e (diff) | |
| download | linux-2b32769700f857a8e608a8ee24080833889965b9.tar.bz2 | |
Merge tag 'perf-urgent-for-mingo-5.4-20190921' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
perf tests:
Jiri Olsa:
- Fix 'make -C tools/perf build-test' static build entry.
perf record:
Jiri Olsa:
- Fix segfault in cpu_cache_level__read() when reading CPU topology.
session:
Mamatha Inamdar:
- Properly propagate error when reading a perf.data file, it may
not exist or the user may not have permissions, etc.
perf probe:
Masami Hiramatsu:
- Skip same probe address for a given line.
- Clear tev->nargs in clear_probe_trace_event(), fixing segfault.
tools headers UAPI:
Arnaldo Carvalho de Melo:
- Sync headers, among them prctl.h, that introduces two new options
that are now supported in the 'perf trace' prctl syscall args
beautifiers.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/asm-generic/unistd.h | 2 | ||||
| -rw-r--r-- | tools/include/uapi/linux/prctl.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h index 1be0e798e362..1fc8faa6e973 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -569,7 +569,7 @@ __SYSCALL(__NR_semget, sys_semget) __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl) #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32 #define __NR_semtimedop 192 -__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32) +__SC_3264(__NR_semtimedop, sys_semtimedop_time32, sys_semtimedop) #endif #define __NR_semop 193 __SYSCALL(__NR_semop, sys_semop) diff --git a/tools/include/uapi/linux/prctl.h b/tools/include/uapi/linux/prctl.h index 094bb03b9cc2..7da1b37b27aa 100644 --- a/tools/include/uapi/linux/prctl.h +++ b/tools/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 @@ -229,4 +229,9 @@ struct prctl_mm_map { # define PR_PAC_APDBKEY (1UL << 3) # define PR_PAC_APGAKEY (1UL << 4) +/* Tagged user address controls for arm64 */ +#define PR_SET_TAGGED_ADDR_CTRL 55 +#define PR_GET_TAGGED_ADDR_CTRL 56 +# define PR_TAGGED_ADDR_ENABLE (1UL << 0) + #endif /* _LINUX_PRCTL_H */ |