diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-07 07:51:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-07 07:51:14 +0100 |
| commit | 75b5293a5d176cd9caf6dc590da4f3458c048c3c (patch) | |
| tree | 40929d6108c662d6eb4c65f900312a37d0d6d566 /tools/perf/builtin-annotate.c | |
| parent | 10a18d7dc0d9f12483c95ffc234118e9b80edfeb (diff) | |
| parent | ce47dc56a2241dc035160a85bc5e34283cdd622c (diff) | |
| download | linux-75b5293a5d176cd9caf6dc590da4f3458c048c3c.tar.gz linux-75b5293a5d176cd9caf6dc590da4f3458c048c3c.tar.xz | |
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, 3 insertions, 3 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 6d5604d8df95..569a2761b90a 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -58,12 +58,12 @@ static int hists__add_entry(struct hists *self, struct addr_location *al) return hist_entry__inc_addr_samples(he, al->addr); } -static int process_sample_event(event_t *event, struct perf_session *session) +static int process_sample_event(event_t *event, struct sample_data *sample, + struct perf_session *session) { struct addr_location al; - struct sample_data data; - if (event__preprocess_sample(event, session, &al, &data, NULL) < 0) { + if (event__preprocess_sample(event, session, &al, sample, NULL) < 0) { pr_warning("problem processing %d event, skipping it.\n", event->header.type); return -1; |