diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /tools/perf/builtin-test.c | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
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 55f4c76f282..efe696f936e 100644 --- a/tools/perf/builtin-test.c +++ b/tools/perf/builtin-test.c @@ -561,7 +561,7 @@ static int test__basic_mmap(void) } err = perf_event__parse_sample(event, attr.sample_type, sample_size, - false, &sample); + false, &sample, false); if (err) { pr_err("Can't parse sample, err = %d\n", err); goto out_munmap; |