From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932594AbbCXQan (ORCPT ); Tue, 24 Mar 2015 12:30:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56778 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752301AbbCXQai (ORCPT ); Tue, 24 Mar 2015 12:30:38 -0400 Date: Tue, 24 Mar 2015 09:29:23 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: acme@redhat.com, eranian@google.com, cjashfor@linux.vnet.ibm.com, namhyung@kernel.org, tglx@linutronix.de, mingo@kernel.org, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, fweisbec@gmail.com, adrian.hunter@intel.com, jolsa@kernel.org, paulus@samba.org Reply-To: dsahern@gmail.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, cjashfor@linux.vnet.ibm.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@kernel.org, paulus@samba.org, a.p.zijlstra@chello.nl, fweisbec@gmail.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove compressed argument from is_kernel_module Git-Commit-ID: e746b3ea0d414b3382bb61c8cecc45cefb370fbf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e746b3ea0d414b3382bb61c8cecc45cefb370fbf Gitweb: http://git.kernel.org/tip/e746b3ea0d414b3382bb61c8cecc45cefb370fbf Author: Jiri Olsa AuthorDate: Thu, 12 Feb 2015 22:16:34 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Mar 2015 12:39:30 -0300 perf tools: Remove compressed argument from is_kernel_module We no longer need the 'compressed' argument, because all current users use 'NULL' for it. Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-d72q2s7ggbmy2yzhumux4zzw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 f375483..8803a69 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 3c81d83..54dd03a 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 1f407f7..fb43215 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 6ca61a3..1de5438 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;