diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
commit | ce09673636f9581d2e2e24af785c463c030a1fd8 (patch) | |
tree | 5d696220bd70dcad7cc0809cf6e3225b4953bf05 /tools/perf/builtin-record.c | |
parent | 45237f9898fce54a8cc6d40f7455291e0e6c4277 (diff) | |
parent | a96bfed64c8986d6404e553f18203cae1f5ac7e6 (diff) | |
download | linux-stable-ce09673636f9581d2e2e24af785c463c030a1fd8.tar.gz linux-stable-ce09673636f9581d2e2e24af785c463c030a1fd8.tar.bz2 linux-stable-ce09673636f9581d2e2e24af785c463c030a1fd8.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes, since perf/urgent is already upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-record.c')
-rw-r--r-- | tools/perf/builtin-record.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index bc3dd379eb67..71efe6573ee7 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2733,6 +2733,12 @@ int cmd_record(int argc, const char **argv) rec->no_buildid = true; } + if (rec->opts.record_cgroup && !perf_can_record_cgroup()) { + pr_err("Kernel has no cgroup sampling support.\n"); + err = -EINVAL; + goto out_opts; + } + if (rec->opts.kcore) rec->data.is_dir = true; |