diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-03-28 12:56:32 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 12:58:28 +0300 |
| commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
| tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /tools/perf/util/stat.c | |
| parent | db779ef67ffeadbb44e9e818eb64dbe528e2f48f (diff) | |
| parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) | |
| download | linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.xz | |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/stat.c')
| -rw-r--r-- | tools/perf/util/stat.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 4d40515307b8..2856cc9d5a31 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -291,10 +291,8 @@ process_counter_values(struct perf_stat_config *config, struct perf_evsel *evsel break; case AGGR_GLOBAL: aggr->val += count->val; - if (config->scale) { - aggr->ena += count->ena; - aggr->run += count->run; - } + aggr->ena += count->ena; + aggr->run += count->run; case AGGR_UNSET: default: break; @@ -442,10 +440,8 @@ int create_perf_stat_counter(struct perf_evsel *evsel, struct perf_event_attr *attr = &evsel->attr; struct perf_evsel *leader = evsel->leader; - if (config->scale) { - attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | - PERF_FORMAT_TOTAL_TIME_RUNNING; - } + attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | + PERF_FORMAT_TOTAL_TIME_RUNNING; /* * The event is part of non trivial group, let's enable |