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

Commit 4b99375b authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf machine: Rename machine__get_kernel_start_addr() method 



Rename machine__get_kernel_start_addr() to
machine__get_running_kernel_start() so that a new function, with a
similar name to the original name, can be added that gets the kernel
start address from the kernel map.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1408129739-17368-4-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d445dd2a

tools/perf/util/machine.c

+4 −4
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ const char *ref_reloc_sym_names[] = {"_text", "_stext", NULL}; 
 * Returns the name of the start symbol in *symbol_name. Pass in NULL as

 * symbol_name if it's not that important.

 */

static u64 machine__get_kernel_start_addr(struct machine *machine,

static u64 machine__get_running_kernel_start(struct machine *machine,

					     const char **symbol_name)

{

	char filename[PATH_MAX];
@@ -621,7 +621,7 @@ static u64 machine__get_kernel_start_addr(struct machine *machine, 
int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)

{

	enum map_type type;

	u64 start = machine__get_kernel_start_addr(machine, NULL);

	u64 start = machine__get_running_kernel_start(machine, NULL);



	for (type = 0; type < MAP__NR_TYPES; ++type) {

		struct kmap *kmap;
@@ -940,7 +940,7 @@ int machine__create_kernel_maps(struct machine *machine) 
{

	struct dso *kernel = machine__get_kernel(machine);

	const char *name;

	u64 addr = machine__get_kernel_start_addr(machine, &name);

	u64 addr = machine__get_running_kernel_start(machine, &name);

	if (!addr)

		return -1;