diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-08 19:42:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-08 19:42:08 +0200 |
| commit | becf6c97a3abaefb2f01415c0b908a268c92b2c3 (patch) | |
| tree | 6b53ef8f7ae31f2b2701495bad61c03e20e6c1c8 /tools/perf/builtin-annotate.c | |
| parent | 6113e45f831616de98c54a005260223b21bcb6b9 (diff) | |
| parent | bafb67470b294810f62db40b348643062255702b (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 96db5248e995..fd20670ce986 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -61,11 +61,9 @@ static int hists__add_entry(struct hists *self, struct addr_location *al) static int process_sample_event(event_t *event, struct perf_session *session) { struct addr_location al; + struct sample_data data; - dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc, - event->ip.pid, event->ip.ip); - - if (event__preprocess_sample(event, session, &al, NULL) < 0) { + if (event__preprocess_sample(event, session, &al, &data, NULL) < 0) { pr_warning("problem processing %d event, skipping it.\n", event->header.type); return -1; |