diff options
Diffstat (limited to 'tools/perf/builtin-mem.c')
-rw-r--r-- | tools/perf/builtin-mem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index a8ff6d264e50..253133a6251d 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c | |||
@@ -14,7 +14,6 @@ static const char *mem_operation = MEM_OPERATION_LOAD; | |||
14 | struct perf_mem { | 14 | struct perf_mem { |
15 | struct perf_tool tool; | 15 | struct perf_tool tool; |
16 | char const *input_name; | 16 | char const *input_name; |
17 | symbol_filter_t annotate_init; | ||
18 | bool hide_unresolved; | 17 | bool hide_unresolved; |
19 | bool dump_raw; | 18 | bool dump_raw; |
20 | const char *cpu_list; | 19 | const char *cpu_list; |
@@ -69,8 +68,7 @@ dump_raw_samples(struct perf_tool *tool, | |||
69 | struct addr_location al; | 68 | struct addr_location al; |
70 | const char *fmt; | 69 | const char *fmt; |
71 | 70 | ||
72 | if (perf_event__preprocess_sample(event, machine, &al, sample, | 71 | if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) { |
73 | mem->annotate_init) < 0) { | ||
74 | fprintf(stderr, "problem processing %d event, skipping it.\n", | 72 | fprintf(stderr, "problem processing %d event, skipping it.\n", |
75 | event->header.type); | 73 | event->header.type); |
76 | return -1; | 74 | return -1; |
@@ -96,7 +94,7 @@ dump_raw_samples(struct perf_tool *tool, | |||
96 | symbol_conf.field_sep, | 94 | symbol_conf.field_sep, |
97 | sample->tid, | 95 | sample->tid, |
98 | symbol_conf.field_sep, | 96 | symbol_conf.field_sep, |
99 | event->ip.ip, | 97 | sample->ip, |
100 | symbol_conf.field_sep, | 98 | symbol_conf.field_sep, |
101 | sample->addr, | 99 | sample->addr, |
102 | symbol_conf.field_sep, | 100 | symbol_conf.field_sep, |
@@ -192,6 +190,7 @@ int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused) | |||
192 | .tool = { | 190 | .tool = { |
193 | .sample = process_sample_event, | 191 | .sample = process_sample_event, |
194 | .mmap = perf_event__process_mmap, | 192 | .mmap = perf_event__process_mmap, |
193 | .mmap2 = perf_event__process_mmap2, | ||
195 | .comm = perf_event__process_comm, | 194 | .comm = perf_event__process_comm, |
196 | .lost = perf_event__process_lost, | 195 | .lost = perf_event__process_lost, |
197 | .fork = perf_event__process_fork, | 196 | .fork = perf_event__process_fork, |