Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

1 files changed, 8 insertions, 7 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 5de405d45230..904519fba434 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -150,13 +150,13 @@ static int add_event_total(struct perf_session *session,
         return 0;
 }
 
-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 sample_data data = { .period = 1, };
         struct addr_location al;
         struct perf_event_attr *attr;
 
-        if (event__preprocess_sample(event, session, &al, &data, NULL) < 0) {
+        if (event__preprocess_sample(event, session, &al, sample, NULL) < 0) {
                 fprintf(stderr, "problem processing %d event, skipping it.\n",
                         event->header.type);
                 return -1;
@@ -165,14 +165,14 @@ static int process_sample_event(event_t *event, struct perf_session *session)
         if (al.filtered || (hide_unresolved && al.sym == NULL))
                 return 0;
 
-        if (perf_session__add_hist_entry(session, &al, &data)) {
+        if (perf_session__add_hist_entry(session, &al, sample)) {
                 pr_debug("problem incrementing symbol period, skipping event\n");
                 return -1;
         }
 
-        attr = perf_header__find_attr(data.id, &session->header);
+        attr = perf_header__find_attr(sample->id, &session->header);
 
-        if (add_event_total(session, &data, attr)) {
+        if (add_event_total(session, sample, attr)) {
                 pr_debug("problem adding event period\n");
                 return -1;
         }
@@ -180,7 +180,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
         return 0;
 }
 
-static int process_read_event(event_t *event, struct perf_session *session __used)
+static int process_read_event(event_t *event, struct sample_data *sample __used,
+                              struct perf_session *session __used)
 {
         struct perf_event_attr *attr;