diff options
Diffstat (limited to 'tools/perf/tests/code-reading.c')
| -rw-r--r-- | tools/perf/tests/code-reading.c | 13 | 
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 67f2d6323558..f671ec37a7c4 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -133,8 +133,7 @@ static int read_via_objdump(const char *filename, u64 addr, void *buf,  }  static int read_object_code(u64 addr, size_t len, u8 cpumode, -			    struct thread *thread, struct machine *machine, -			    struct state *state) +			    struct thread *thread, struct state *state)  {  	struct addr_location al;  	unsigned char buf1[BUFSZ]; @@ -145,8 +144,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,  	pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr); -	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION, addr, -			      &al); +	thread__find_addr_map(thread, cpumode, MAP__FUNCTION, addr, &al);  	if (!al.map || !al.map->dso) {  		pr_debug("thread__find_addr_map failed\n");  		return -1; @@ -170,8 +168,8 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,  		len = al.map->end - addr;  	/* Read the object code using perf */ -	ret_len = dso__data_read_offset(al.map->dso, machine, al.addr, buf1, -					len); +	ret_len = dso__data_read_offset(al.map->dso, thread->mg->machine, +					al.addr, buf1, len);  	if (ret_len != len) {  		pr_debug("dso__data_read_offset failed\n");  		return -1; @@ -264,8 +262,7 @@ static int process_sample_event(struct machine *machine,  	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; -	return read_object_code(sample.ip, READLEN, cpumode, thread, machine, -				state); +	return read_object_code(sample.ip, READLEN, cpumode, thread, state);  }  static int process_event(struct machine *machine, struct perf_evlist *evlist,  |