summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-23 15:17:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-23 15:17:02 -0700
commit78bbd284e85f1af56a9fa30760c019357c2a1b4b (patch)
tree3e1d397a35d416e9c3d809f3dc8d9a8bac346af3
parenteab8bcb67a6f4e8d428b76c894a447229812c8ac (diff)
parent2b022a82a01737012155b5ba462db74232ff1f2e (diff)
downloadlinux-stable-78bbd284e85f1af56a9fa30760c019357c2a1b4b.tar.gz
linux-stable-78bbd284e85f1af56a9fa30760c019357c2a1b4b.tar.bz2
linux-stable-78bbd284e85f1af56a9fa30760c019357c2a1b4b.zip
Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux
* 'perf-tools-for-linus' of git://github.com/acmel/linux: perf python: Add missing perf_event__parse_sample 'swapped' parm
-rw-r--r--tools/perf/util/python.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index cbc8f215d4b7..7624324efad4 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -803,7 +803,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
first = list_entry(evlist->entries.next, struct perf_evsel, node);
err = perf_event__parse_sample(event, first->attr.sample_type,
perf_evsel__sample_size(first),
- sample_id_all, &pevent->sample);
+ sample_id_all, &pevent->sample, false);
if (err)
return PyErr_Format(PyExc_OSError,
"perf: can't parse sample, err=%d", err);