diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
| commit | 0422fe2666aea4c0986f4c89dc107731aa6a7a81 (patch) | |
| tree | 1d42a146a738fb933f061424751755e630aeccb0 /tools/perf/tests/parse-metric.c | |
| parent | 4b3ddc6462e83452182177b48c4bc53607acd68e (diff) | |
| parent | d1587f7bfe9a0f97a75d42ac1489aeda551106bc (diff) | |
Merge branch 'linus' into irq/core, to fix conflict
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests/parse-metric.c')
| -rw-r--r-- | tools/perf/tests/parse-metric.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c index 574b7e4efd3a..07b6f4ec024f 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -109,6 +109,7 @@ static void load_runtime_stat(struct runtime_stat *st, struct evlist *evlist, struct evsel *evsel; u64 count; + perf_stat__reset_shadow_stats(); evlist__for_each_entry(evlist, evsel) { count = find_value(evsel->name, vals); perf_stat__update_shadow_stats(evsel, count, 0, st); |