diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index f37548322c9debe2218bb538f1758585f440a797..8803a69fc260b9b663fba01b08ce26d622c4e28c 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -176,16 +176,13 @@ bool is_kmodule_extension(const char *ext) return false; } -bool is_kernel_module(const char *pathname, bool *compressed) +bool is_kernel_module(const char *pathname) { struct kmod_path m; if (kmod_path__parse(&m, pathname)) return NULL; - if (compressed) - *compressed = m.comp; - return m.kmod; } diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index 3c81d8378bc749157047162853c5e0e076bea4c0..54dd03a490ce9e05fbb2a9a519528d102e87fc71 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -191,7 +191,7 @@ int dso__read_binary_type_filename(const struct dso *dso, enum dso_binary_type t char *root_dir, char *filename, size_t size); bool is_supported_compression(const char *ext); bool is_kmodule_extension(const char *ext); -bool is_kernel_module(const char *pathname, bool *compressed); +bool is_kernel_module(const char *pathname); bool decompress_to_file(const char *ext, const char *filename, int output_fd); bool dso__needs_decompress(struct dso *dso); diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 1f407f7352a7fd2bab67ad13e63e5fcd053495ba..fb432153e2aa33d7eb4862c434bd69fe069d9861 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1266,7 +1266,7 @@ static int __event_process_build_id(struct build_id_event *bev, dso__set_build_id(dso, &bev->build_id); - if (!is_kernel_module(filename, NULL)) + if (!is_kernel_module(filename)) dso->kernel = dso_type; build_id__sprintf(dso->build_id, sizeof(dso->build_id), diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 6ca61a3427a61e62d59f2e0e874f9714143e9f43..1de5438ad0700206e8b8eb9064cfce4f4ee24903 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1104,7 +1104,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, struct dso *dso; list_for_each_entry(dso, &machine->kernel_dsos.head, node) { - if (is_kernel_module(dso->long_name, NULL)) + if (is_kernel_module(dso->long_name)) continue; kernel = dso;