Merge tag 'qcom-dts-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom...

[linux.git] / tools / perf / util / scripting-engines / trace-event-python.c

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 7cbd024e3e634433a22b105d746d147c69a66153..c83c2c6564e010895845a243f564750b15789eba 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -1592,7 +1592,6 @@ static void _free_command_line(wchar_t **command_line, int num)
 static int python_start_script(const char *script, int argc, const char **argv)
 {
        struct tables *tables = &tables_global;
 static int python_start_script(const char *script, int argc, const char **argv)
 {
        struct tables *tables = &tables_global;

-       PyMODINIT_FUNC (*initfunc)(void);

 #if PY_MAJOR_VERSION < 3
        const char **command_line;
 #else
 #if PY_MAJOR_VERSION < 3
        const char **command_line;
 #else


@@ -1607,20 +1606,18 @@ static int python_start_script(const char *script, int argc, const char **argv)
        FILE *fp;
 
 #if PY_MAJOR_VERSION < 3
        FILE *fp;
 
 #if PY_MAJOR_VERSION < 3

-       initfunc = initperf_trace_context;

        command_line = malloc((argc + 1) * sizeof(const char *));
        command_line[0] = script;
        for (i = 1; i < argc + 1; i++)
                command_line[i] = argv[i - 1];
        command_line = malloc((argc + 1) * sizeof(const char *));
        command_line[0] = script;
        for (i = 1; i < argc + 1; i++)
                command_line[i] = argv[i - 1];

+       PyImport_AppendInittab(name, initperf_trace_context);

 #else
 #else

-       initfunc = PyInit_perf_trace_context;

        command_line = malloc((argc + 1) * sizeof(wchar_t *));
        command_line[0] = Py_DecodeLocale(script, NULL);
        for (i = 1; i < argc + 1; i++)
                command_line[i] = Py_DecodeLocale(argv[i - 1], NULL);
        command_line = malloc((argc + 1) * sizeof(wchar_t *));
        command_line[0] = Py_DecodeLocale(script, NULL);
        for (i = 1; i < argc + 1; i++)
                command_line[i] = Py_DecodeLocale(argv[i - 1], NULL);

+       PyImport_AppendInittab(name, PyInit_perf_trace_context);

 #endif
 #endif

-
-       PyImport_AppendInittab(name, initfunc);

        Py_Initialize();
 
 #if PY_MAJOR_VERSION < 3
        Py_Initialize();
 
 #if PY_MAJOR_VERSION < 3