diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a (patch) | |
tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 /tools/perf/util/evsel.c | |
parent | r8169: add support for Byte Queue Limits (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-21ea1d36f6dfcb1d59184937c672022d5d01902a.tar.xz linux-dev-21ea1d36f6dfcb1d59184937c672022d5d01902a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David Ahern's dump indexing bug fix in 'net' overlapped the
change of the function signature of inet6_fill_ifaddr() in
'net-next'. Trivially resolved.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/evsel.c')
-rw-r--r-- | tools/perf/util/evsel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 1a61628a1c12..e596ae358c4d 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1089,6 +1089,9 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts, attr->exclude_user = 1; } + if (evsel->own_cpus) + evsel->attr.read_format |= PERF_FORMAT_ID; + /* * Apply event specific term settings, * it overloads any global configuration. |