mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-08 02:49:48 +00:00
perf python: Remove python 2 scripting support
Python2 was deprecated 4 years ago, remove support and workarounds. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Colin Ian King <colin.i.king@gmail.com> Cc: Dapeng Mi <dapeng1.mi@linux.intel.com> Cc: Howard Chu <howardchu95@gmail.com> Cc: Ilya Leoshkevich <iii@linux.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Veronika Molnarova <vmolnaro@redhat.com> Cc: Weilin Wang <weilin.wang@intel.com> Link: https://lore.kernel.org/r/20241119011644.971342-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
4c7f9ee2eb
commit
e7e9943c87
@@ -24,16 +24,6 @@
|
||||
#include "../../../util/srcline.h"
|
||||
#include "../../../util/srccode.h"
|
||||
|
||||
#if PY_MAJOR_VERSION < 3
|
||||
#define _PyCapsule_GetPointer(arg1, arg2) \
|
||||
PyCObject_AsVoidPtr(arg1)
|
||||
#define _PyBytes_FromStringAndSize(arg1, arg2) \
|
||||
PyString_FromStringAndSize((arg1), (arg2))
|
||||
#define _PyUnicode_AsUTF8(arg) \
|
||||
PyString_AsString(arg)
|
||||
|
||||
PyMODINIT_FUNC initperf_trace_context(void);
|
||||
#else
|
||||
#define _PyCapsule_GetPointer(arg1, arg2) \
|
||||
PyCapsule_GetPointer((arg1), (arg2))
|
||||
#define _PyBytes_FromStringAndSize(arg1, arg2) \
|
||||
@@ -42,7 +32,6 @@ PyMODINIT_FUNC initperf_trace_context(void);
|
||||
PyUnicode_AsUTF8(arg)
|
||||
|
||||
PyMODINIT_FUNC PyInit_perf_trace_context(void);
|
||||
#endif
|
||||
|
||||
static struct scripting_context *get_args(PyObject *args, const char *name, PyObject **arg2)
|
||||
{
|
||||
@@ -213,12 +202,6 @@ static PyMethodDef ContextMethods[] = {
|
||||
{ NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
#if PY_MAJOR_VERSION < 3
|
||||
PyMODINIT_FUNC initperf_trace_context(void)
|
||||
{
|
||||
(void) Py_InitModule("perf_trace_context", ContextMethods);
|
||||
}
|
||||
#else
|
||||
PyMODINIT_FUNC PyInit_perf_trace_context(void)
|
||||
{
|
||||
static struct PyModuleDef moduledef = {
|
||||
@@ -240,4 +223,3 @@ PyMODINIT_FUNC PyInit_perf_trace_context(void)
|
||||
|
||||
return mod;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user