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/util/python.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/util/python.c')
| -rw-r--r-- | tools/perf/util/python.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index f5e38451fdc5..99c722672f84 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c | |||
| @@ -680,7 +680,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
| 680 | &cpu, &sample_id_all)) | 680 | &cpu, &sample_id_all)) |
| 681 | return NULL; | 681 | return NULL; |
| 682 | 682 | ||
| 683 | event = perf_evlist__read_on_cpu(evlist, cpu); | 683 | event = perf_evlist__mmap_read(evlist, cpu); |
| 684 | if (event != NULL) { | 684 | if (event != NULL) { |
| 685 | struct perf_evsel *first; | 685 | struct perf_evsel *first; |
| 686 | PyObject *pyevent = pyrf_event__new(event); | 686 | PyObject *pyevent = pyrf_event__new(event); |