diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-07-01 17:46:34 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-07-01 17:46:34 +0200 |
commit | e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c (patch) | |
tree | 4b1109adc051c943ef3edd990f5a907a0836bdf8 /tools/perf/builtin-record.c | |
parent | drm/i915/display: Fix state mismatch in drm infoframe (diff) | |
parent | Merge tag 'drm-intel-next-fixes-2021-06-29' of git://anongit.freedesktop.org/... (diff) | |
download | linux-e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c.tar.xz linux-e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c.zip |
Merge drm/drm-next into drm-intel-next
Bring drm-intel-next closer to drm-next and drm-intel-gt-next for a more
feasible baseline for topic branches.
Signed-off-by: Jani Nikula <jani.nikula@intel.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 3337b5f93336..84803abeb942 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2714,6 +2714,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; |