perf auxtrace: Remove auxtrace_mmap_params__set_idx() per_cpu parameter

Remove auxtrace_mmap_params__set_idx() per_cpu parameter because it isn't
needed.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Link: https://lore.kernel.org/r/20220524075436.29144-4-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index b446cfa66469c7aad796c3d9f4e457c7b6f1ed15..ac4e4660932db1babdcfed975f4b72affd41df90 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -169,9 +169,10 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
 
 void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
                                   struct evlist *evlist,
-                                  struct evsel *evsel, int idx,
-                                  bool per_cpu)
+                                  struct evsel *evsel, int idx)
 {
+       bool per_cpu = !perf_cpu_map__empty(evlist->core.user_requested_cpus);
+
        mp->mmap_needed = evsel->needs_auxtrace_mmap;
 
        if (!mp->mmap_needed)

diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
index 695591b73ae118197d81c785c9e2df257d9589b3..cd0d25c2751cc36e3fd17e7138e2c89719f6b47d 100644 (file)
--- a/tools/perf/util/auxtrace.h
+++ b/tools/perf/util/auxtrace.h
@@ -496,8 +496,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
                                bool auxtrace_overwrite);
 void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
                                   struct evlist *evlist,
-                                  struct evsel *evsel, int idx,
-                                  bool per_cpu);
+                                  struct evsel *evsel, int idx);
 
 typedef int (*process_auxtrace_t)(struct perf_tool *tool,
                                  struct mmap *map,
@@ -870,8 +869,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
                                bool auxtrace_overwrite);
 void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
                                   struct evlist *evlist,
-                                  struct evsel *evsel, int idx,
-                                  bool per_cpu);
+                                  struct evsel *evsel, int idx);
 
 #define ITRACE_HELP ""
 

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 9e0fabfb096d12364da6f39dfaf2f3d9f7c17ed3..157867bc337ae93d5844ab65448382ed3811b603 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -753,10 +753,9 @@ perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist,
 {
        struct evlist *evlist = container_of(_evlist, struct evlist, core);
        struct mmap_params *mp = container_of(_mp, struct mmap_params, core);
-       bool per_cpu = !perf_cpu_map__empty(_evlist->user_requested_cpus);
        struct evsel *evsel = container_of(_evsel, struct evsel, core);
 
-       auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx, per_cpu);
+       auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx);
 }
 
 static struct perf_mmap*

diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index de59c4da852b645a3878dc2e42e4802dfe314ceb..a4dff881be39b65f4d2b1f878b76ecb30f5b85d8 100644 (file)
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -63,8 +63,7 @@ void __weak auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp __maybe_u
 void __weak auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp __maybe_unused,
                                          struct evlist *evlist __maybe_unused,
                                          struct evsel *evsel __maybe_unused,
-                                         int idx __maybe_unused,
-                                         bool per_cpu __maybe_unused)
+                                         int idx __maybe_unused)
 {
 }