diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-04-22 14:08:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-04-22 14:08:28 +0200 |
commit | 87cfeb1920f84f465a738d4c6589033eefa20b45 (patch) | |
tree | 10b9625c9f1b7be9c722c6a0c6ab24f95df31f6f /security | |
parent | 18bf34080c4c3beb6699181986cc97dd712498fe (diff) | |
parent | 12e89e65f446476951f42aedeef56b6bd6f7f1e6 (diff) | |
download | linux-stable-87cfeb1920f84f465a738d4c6589033eefa20b45.tar.gz linux-stable-87cfeb1920f84f465a738d4c6589033eefa20b45.tar.bz2 linux-stable-87cfeb1920f84f465a738d4c6589033eefa20b45.zip |
Merge tag 'perf-core-for-mingo-5.8-20200420' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core fixes and improvements from Arnaldo Carvalho de Melo:
kernel + tools/perf:
Alexey Budankov:
- Introduce CAP_PERFMON to kernel and user space.
callchains:
Adrian Hunter:
- Allow using Intel PT to synthesize callchains for regular events.
Kan Liang:
- Stitch LBR records from multiple samples to get deeper backtraces,
there are caveats, see the csets for details.
perf script:
Andreas Gerstmayr:
- Add flamegraph.py script
BPF:
Jiri Olsa:
- Synthesize bpf_trampoline/dispatcher ksymbol events.
perf stat:
Arnaldo Carvalho de Melo:
- Honour --timeout for forked workloads.
Stephane Eranian:
- Force error in fallback on :k events, to avoid counting nothing when
the user asks for kernel events but is not allowed to.
perf bench:
Ian Rogers:
- Add event synthesis benchmark.
tools api fs:
Stephane Eranian:
- Make xxx__mountpoint() more scalable
libtraceevent:
He Zhe:
- Handle return value of asprintf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/include/classmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 986f3ac14282..d233ab3f1533 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -27,9 +27,9 @@ "audit_control", "setfcap" #define COMMON_CAP2_PERMS "mac_override", "mac_admin", "syslog", \ - "wake_alarm", "block_suspend", "audit_read" + "wake_alarm", "block_suspend", "audit_read", "perfmon" -#if CAP_LAST_CAP > CAP_AUDIT_READ +#if CAP_LAST_CAP > CAP_PERFMON #error New capability defined, please update COMMON_CAP2_PERMS. #endif |