aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-02-12 16:16:34 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-03-23 11:39:30 -0400
commite746b3ea0d414b3382bb61c8cecc45cefb370fbf (patch)
treecc2e9310968518a2a04b25cd2e4912f77209aa1a /tools
parent8dee9ff110f11fa536caef3cd2da23b74dceaf5b (diff)
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 <jolsa@kernel.org> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-d72q2s7ggbmy2yzhumux4zzw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/dso.c5
-rw-r--r--tools/perf/util/dso.h2
-rw-r--r--tools/perf/util/header.c2
-rw-r--r--tools/perf/util/machine.c2
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)
176 return false; 176 return false;
177} 177}
178 178
179bool is_kernel_module(const char *pathname, bool *compressed) 179bool is_kernel_module(const char *pathname)
180{ 180{
181 struct kmod_path m; 181 struct kmod_path m;
182 182
183 if (kmod_path__parse(&m, pathname)) 183 if (kmod_path__parse(&m, pathname))
184 return NULL; 184 return NULL;
185 185
186 if (compressed)
187 *compressed = m.comp;
188
189 return m.kmod; 186 return m.kmod;
190} 187}
191 188
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index 3c81d8378bc7..54dd03a490ce 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
191 char *root_dir, char *filename, size_t size); 191 char *root_dir, char *filename, size_t size);
192bool is_supported_compression(const char *ext); 192bool is_supported_compression(const char *ext);
193bool is_kmodule_extension(const char *ext); 193bool is_kmodule_extension(const char *ext);
194bool is_kernel_module(const char *pathname, bool *compressed); 194bool is_kernel_module(const char *pathname);
195bool decompress_to_file(const char *ext, const char *filename, int output_fd); 195bool decompress_to_file(const char *ext, const char *filename, int output_fd);
196bool dso__needs_decompress(struct dso *dso); 196bool dso__needs_decompress(struct dso *dso);
197 197
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,
1266 1266
1267 dso__set_build_id(dso, &bev->build_id); 1267 dso__set_build_id(dso, &bev->build_id);
1268 1268
1269 if (!is_kernel_module(filename, NULL)) 1269 if (!is_kernel_module(filename))
1270 dso->kernel = dso_type; 1270 dso->kernel = dso_type;
1271 1271
1272 build_id__sprintf(dso->build_id, sizeof(dso->build_id), 1272 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,
1104 struct dso *dso; 1104 struct dso *dso;
1105 1105
1106 list_for_each_entry(dso, &machine->kernel_dsos.head, node) { 1106 list_for_each_entry(dso, &machine->kernel_dsos.head, node) {
1107 if (is_kernel_module(dso->long_name, NULL)) 1107 if (is_kernel_module(dso->long_name))
1108 continue; 1108 continue;
1109 1109
1110 kernel = dso; 1110 kernel = dso;