diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-28 03:46:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-28 03:46:43 -0400 |
| commit | 1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (patch) | |
| tree | f33947a6603b406ba1e8b80114b2de313bcd9f09 /tools/perf/util/python.c | |
| parent | ac2ba2b363a40a2431506d446985af4e4108b0d2 (diff) | |
| parent | aec1930b0f6f281a0ca038cd03aceace3fe0bb61 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee.
* Don't stop the build if the audit libraries are not installed, fix from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 ca85444bcfbf..9181bf212fb9 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c | |||
| @@ -805,7 +805,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
| 805 | if (pyevent == NULL) | 805 | if (pyevent == NULL) |
| 806 | return PyErr_NoMemory(); | 806 | return PyErr_NoMemory(); |
| 807 | 807 | ||
| 808 | err = perf_evlist__parse_sample(evlist, event, &pevent->sample, false); | 808 | err = perf_evlist__parse_sample(evlist, event, &pevent->sample); |
| 809 | if (err) | 809 | if (err) |
| 810 | return PyErr_Format(PyExc_OSError, | 810 | return PyErr_Format(PyExc_OSError, |
| 811 | "perf: can't parse sample, err=%d", err); | 811 | "perf: can't parse sample, err=%d", err); |
