diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-15 13:41:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-15 13:41:00 -0400 |
| commit | 52004ea7ca4c52a219362f973bfd1eb86ff668ce (patch) | |
| tree | 086b6920202cf1c7e014f829350848df71eb9a8c /tools/perf/builtin-test.c | |
| parent | 9bbeacf52f66d165739a4bbe9c018d17493a74b5 (diff) | |
| parent | aece948f5ddd70d70df2f35855c706ef9a4f62e2 (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
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 11e3c8458362..2f9a337b182f 100644 --- a/tools/perf/builtin-test.c +++ b/tools/perf/builtin-test.c | |||
| @@ -549,7 +549,7 @@ static int test__basic_mmap(void) | |||
| 549 | ++foo; | 549 | ++foo; |
| 550 | } | 550 | } |
| 551 | 551 | ||
| 552 | while ((event = perf_evlist__read_on_cpu(evlist, 0)) != NULL) { | 552 | while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) { |
| 553 | struct perf_sample sample; | 553 | struct perf_sample sample; |
| 554 | 554 | ||
| 555 | if (event->header.type != PERF_RECORD_SAMPLE) { | 555 | if (event->header.type != PERF_RECORD_SAMPLE) { |