Merge 3.0-rc2 + Linus's latest into usb-linus

This is needed to get the following MAINTAINERS patch to apply properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 8 deletions

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 69436b3200a4..a9ac0504aabd 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -674,7 +674,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
         struct perf_evlist *evlist = &pevlist->evlist;
         union perf_event *event;
         int sample_id_all = 1, cpu;
-        static char *kwlist[] = {"sample_id_all", NULL, NULL};
+        static char *kwlist[] = {"cpu", "sample_id_all", NULL, NULL};
         int err;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist,
@@ -692,16 +692,14 @@ 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_sample_size(first->attr.sample_type),
+                                               perf_evsel__sample_size(first),
                                                sample_id_all, &pevent->sample);
-                if (err) {
-                        pr_err("Can't parse sample, err = %d\n", err);
-                        goto end;
-                }
-
+                if (err)
+                        return PyErr_Format(PyExc_OSError,
+                                            "perf: can't parse sample, err=%d", err);
                 return pyevent;
         }
-end:
+
         Py_INCREF(Py_None);
         return Py_None;
 }