diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-29 06:23:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-29 06:23:32 -0400 |
| commit | aac898548d04c7bff179b79f805874b0d6f87571 (patch) | |
| tree | e8de975fd5de6c95bf4329861a872dbcfe0c7ead /tools/perf/util/evsel.c | |
| parent | 2f5e98802350627ad6f2e3cee4d177059fc0c2f2 (diff) | |
| parent | cd65718712469ad844467250e8fad20a5838baae (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h
Diffstat (limited to 'tools/perf/util/evsel.c')
| -rw-r--r-- | tools/perf/util/evsel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index ec0cc1e21c62..3a334f001997 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
| @@ -678,7 +678,6 @@ void perf_evsel__config(struct perf_evsel *evsel, | |||
| 678 | attr->sample_type |= PERF_SAMPLE_WEIGHT; | 678 | attr->sample_type |= PERF_SAMPLE_WEIGHT; |
| 679 | 679 | ||
| 680 | attr->mmap = track; | 680 | attr->mmap = track; |
| 681 | attr->mmap2 = track && !perf_missing_features.mmap2; | ||
| 682 | attr->comm = track; | 681 | attr->comm = track; |
| 683 | 682 | ||
| 684 | if (opts->sample_transaction) | 683 | if (opts->sample_transaction) |