diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-14 20:14:01 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-14 20:14:01 -0400 |
| commit | 07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 (patch) | |
| tree | 0cdb5735800ddd63d8850aa26d3a3f1f3334267a /tools/perf/builtin-test.c | |
| parent | 07a062140372187642003e02a49edc8a2115c1ca (diff) | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
Merge commit 'v3.1-rc9' into fbdev-next
Diffstat (limited to 'tools/perf/builtin-test.c')
| -rw-r--r-- | tools/perf/builtin-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c index 55f4c76f2821..efe696f936e2 100644 --- a/tools/perf/builtin-test.c +++ b/tools/perf/builtin-test.c | |||
| @@ -561,7 +561,7 @@ static int test__basic_mmap(void) | |||
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | err = perf_event__parse_sample(event, attr.sample_type, sample_size, | 563 | err = perf_event__parse_sample(event, attr.sample_type, sample_size, |
| 564 | false, &sample); | 564 | false, &sample, false); |
| 565 | if (err) { | 565 | if (err) { |
| 566 | pr_err("Can't parse sample, err = %d\n", err); | 566 | pr_err("Can't parse sample, err = %d\n", err); |
| 567 | goto out_munmap; | 567 | goto out_munmap; |