diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 12:27:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 12:27:35 +0200 |
| commit | b24d0d5b12a678b96676348976982686fbe222b4 (patch) | |
| tree | 565ce37d2d971cb94436241bc2ac48028b6b66d0 /tools/perf/builtin-record.c | |
| parent | 4ac0d3fb13d5acc138d8be7c45715567c2e2ec47 (diff) | |
| parent | 3eb2ce825ea1ad89d20f7a3b5780df850e4be274 (diff) | |
| download | op-kernel-dev-b24d0d5b12a678b96676348976982686fbe222b4.zip op-kernel-dev-b24d0d5b12a678b96676348976982686fbe222b4.tar.gz | |
Merge 4.16-rc7 into char-misc-next
We want the hyperv fix in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index bf4ca74..a217623 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -881,6 +881,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } } + /* + * If we have just single event and are sending data + * through pipe, we need to force the ids allocation, + * because we synthesize event name through the pipe + * and need the id for that. + */ + if (data->is_pipe && rec->evlist->nr_entries == 1) + rec->opts.sample_id = true; + if (record__open(rec) != 0) { err = -1; goto out_child; |
