We no longer need the 'compressed' argument, because all current users use 'NULL' for it.
Signed-off-by: Jiri Olsa <[email protected]> Acked-by: Namhyung Kim <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> --- tools/perf/util/dso.c | 5 +---- tools/perf/util/dso.h | 2 +- tools/perf/util/header.c | 2 +- tools/perf/util/machine.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index f37548322c9d..8803a69fc260 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 dd1ce562419b..bdfca4d58356 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -190,7 +190,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 1f407f7352a7..fb432153e2aa 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 6ca61a3427a6..1de5438ad070 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; -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
