diff options
| author |   Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
| commit | f19f8d8ebc0b392c01082e0feb44ec152cc47a30 (patch) | |
| tree | f45f5391e97e29d5ef0003fc90f34bf0e18ba20f /tools/perf/scripts/python | |
| parent | mfd: twl-core: Fix passing of platform data in the device tree case (diff) | |
| parent | Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4 (diff) | |
| download | linux-dev-f19f8d8ebc0b392c01082e0feb44ec152cc47a30.tar.xz linux-dev-f19f8d8ebc0b392c01082e0feb44ec152cc47a30.zip | |
Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal
Diffstat (limited to 'tools/perf/scripts/python')
| -rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/Context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c index 315067b8f552..fcd1dd667906 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c @@ -25,7 +25,7 @@ PyMODINIT_FUNC initperf_trace_context(void); -static PyObject *perf_trace_context_common_pc(PyObject *self, PyObject *args) +static PyObject *perf_trace_context_common_pc(PyObject *obj, PyObject *args) { static struct scripting_context *scripting_context; PyObject *context; @@ -40,7 +40,7 @@ static PyObject *perf_trace_context_common_pc(PyObject *self, PyObject *args) return Py_BuildValue("i", retval); } -static PyObject *perf_trace_context_common_flags(PyObject *self, +static PyObject *perf_trace_context_common_flags(PyObject *obj, PyObject *args) { static struct scripting_context *scripting_context; @@ -56,7 +56,7 @@ static PyObject *perf_trace_context_common_flags(PyObject *self, return Py_BuildValue("i", retval); } -static PyObject *perf_trace_context_common_lock_depth(PyObject *self, +static PyObject *perf_trace_context_common_lock_depth(PyObject *obj, PyObject *args) { static struct scripting_context *scripting_context; |