diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:13:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:13:46 -0400 |
| commit | 7f12b72bd8532cbbfb147470f0d902260cea36ce (patch) | |
| tree | c62e7f0597faebd0e04acd34b3e6038629d849af /tools/perf/builtin-test.c | |
| parent | 8864f5ee12d03afe269edeeae440744f53ea4af1 (diff) | |
| parent | 52004ea7ca4c52a219362f973bfd1eb86ff668ce (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf evlist: Fix per thread mmap setup
perf tools: Honour the cpu list parameter when also monitoring a thread list
kprobes, x86: Disable irqs during optimized callback
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) { |