diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-29 06:23:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-29 06:23:32 -0400 |
| commit | aac898548d04c7bff179b79f805874b0d6f87571 (patch) | |
| tree | e8de975fd5de6c95bf4329861a872dbcfe0c7ead /tools/perf/util/python.c | |
| parent | 2f5e98802350627ad6f2e3cee4d177059fc0c2f2 (diff) | |
| parent | cd65718712469ad844467250e8fad20a5838baae (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h
Diffstat (limited to 'tools/perf/util/python.c')
| -rw-r--r-- | tools/perf/util/python.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 06efd027b1db..4bf8ace7f511 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c | |||
| @@ -815,6 +815,8 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
| 815 | PyObject *pyevent = pyrf_event__new(event); | 815 | PyObject *pyevent = pyrf_event__new(event); |
| 816 | struct pyrf_event *pevent = (struct pyrf_event *)pyevent; | 816 | struct pyrf_event *pevent = (struct pyrf_event *)pyevent; |
| 817 | 817 | ||
| 818 | perf_evlist__mmap_consume(evlist, cpu); | ||
| 819 | |||
| 818 | if (pyevent == NULL) | 820 | if (pyevent == NULL) |
| 819 | return PyErr_NoMemory(); | 821 | return PyErr_NoMemory(); |
| 820 | 822 | ||