Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[android-x86/kernel.git] / tools / perf / builtin-test.c

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 2f9a337..b671862 100644 (file)
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -474,6 +474,7 @@ static int test__basic_mmap(void)
        unsigned int nr_events[nsyscalls],
                     expected_nr_events[nsyscalls], i, j;
        struct perf_evsel *evsels[nsyscalls], *evsel;
+       int sample_size = perf_sample_size(attr.sample_type);
 
        for (i = 0; i < nsyscalls; ++i) {
                char name[64];
@@ -558,7 +559,13 @@ static int test__basic_mmap(void)
                        goto out_munmap;
                }
 
-               perf_event__parse_sample(event, attr.sample_type, false, &sample);
+               err = perf_event__parse_sample(event, attr.sample_type, sample_size,
+                                              false, &sample);
+               if (err) {
+                       pr_err("Can't parse sample, err = %d\n", err);
+                       goto out_munmap;
+               }
+
                evsel = perf_evlist__id2evsel(evlist, sample.id);
                if (evsel == NULL) {
                        pr_debug("event with id %" PRIu64