Commit 78bbd284 authored by Linus Torvalds's avatar Linus Torvalds

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
parents eab8bcb6 2b022a82
...@@ -803,7 +803,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, ...@@ -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); first = list_entry(evlist->entries.next, struct perf_evsel, node);
err = perf_event__parse_sample(event, first->attr.sample_type, err = perf_event__parse_sample(event, first->attr.sample_type,
perf_evsel__sample_size(first), perf_evsel__sample_size(first),
sample_id_all, &pevent->sample); sample_id_all, &pevent->sample, false);
if (err) if (err)
return PyErr_Format(PyExc_OSError, return PyErr_Format(PyExc_OSError,
"perf: can't parse sample, err=%d", err); "perf: can't parse sample, err=%d", err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment