diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-07 10:45:59 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-07 10:45:59 -0300 |
| commit | 6d78b5c27405369a34f4d5af9d2ed6a93841ee80 (patch) | |
| tree | 60ab9d661742a235f5db15902b8744aa53779547 /tools | |
| parent | ac1185ae3d268bcc538ef3e580e1ef4ed20c1325 (diff) | |
| parent | 1ded0ef2419e8f83a17d65594523ec3aeb2e3d0f (diff) | |
Merge tag 'v5.15.64' into 5.15-2.1.x-imx
This is the 5.15.64 stable release
Conflicts:
net/dsa/slave.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/Makefile.config | 2 | ||||
| -rw-r--r-- | tools/perf/builtin-stat.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 1afc67047420..35e1f2a52435 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -263,7 +263,7 @@ endif # defined. get-executable-or-default fails with an error if the first argument is supplied but # doesn't exist. override PYTHON_CONFIG := $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON_AUTO)) -override PYTHON := $(call get-executable-or-default,PYTHON,$(subst -config,,$(PYTHON_AUTO))) +override PYTHON := $(call get-executable-or-default,PYTHON,$(subst -config,,$(PYTHON_CONFIG))) grep-libs = $(filter -l%,$(1)) strip-libs = $(filter-out -l%,$(1)) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 1a194edb5452..abf88a1ad455 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -807,6 +807,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) return -1; evlist__for_each_entry(evsel_list, counter) { + counter->reset_group = false; if (bpf_counter__load(counter, &target)) return -1; if (!evsel__is_bpf(counter)) |