From: Arnaldo Carvalho de Melo Date: Fri, 16 Dec 2022 12:53:53 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf/core X-Git-Tag: v6.6.7~3878^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a931707ad4a46e79d4ecfee56d8f6e8cc8d4f28;p=platform%2Fkernel%2Flinux-starfive.git Merge remote-tracking branch 'torvalds/master' into perf/core To resolve a trivial merge conflict with c302378bc157f6a7 ("libbpf: Hashmap interface update to allow both long and void* keys/values"), where a function present upstream was removed in the perf tools development tree. Signed-off-by: Arnaldo Carvalho de Melo --- 1a931707ad4a46e79d4ecfee56d8f6e8cc8d4f28 diff --cc tools/perf/util/stat.c index 673f017,c0656f8..534d36d --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@@ -314,7 -258,27 +314,7 @@@ void evlist__copy_prev_raw_counts(struc evsel__copy_prev_raw_counts(evsel); } - static size_t pkg_id_hash(const void *__key, void *ctx __maybe_unused) -void evlist__save_aggr_prev_raw_counts(struct evlist *evlist) -{ - struct evsel *evsel; - - /* - * To collect the overall statistics for interval mode, - * we copy the counts from evsel->prev_raw_counts to - * evsel->counts. The perf_stat_process_counter creates - * aggr values from per cpu values, but the per cpu values - * are 0 for AGGR_GLOBAL. So we use a trick that saves the - * previous aggr value to the first member of perf_counts, - * then aggr calculation in process_counter_values can work - * correctly. - */ - evlist__for_each_entry(evlist, evsel) { - *perf_counts(evsel->prev_raw_counts, 0, 0) = - evsel->prev_raw_counts->aggr; - } -} - + static size_t pkg_id_hash(long __key, void *ctx __maybe_unused) { uint64_t *key = (uint64_t *) __key;