Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e746b3ea authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarNamhyung 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8dee9ff1

tools/perf/util/dso.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

}

tools/perf/util/dso.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

tools/perf/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

tools/perf/util/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -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;