diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-12-18 09:15:12 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-12-18 09:15:12 +0200 |
| commit | 500050f0d28868af302a3c24d7d1d0191521286e (patch) | |
| tree | 7c4366836fcf5c7d7be4292f60d76876b3c463a0 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | c0bc969c176b10598b31d5d1a5edf9a5261f0a9f (diff) | |
| parent | 6efac0173cd15460b48c91e1b0a000379f341f00 (diff) | |
| download | linux-500050f0d28868af302a3c24d7d1d0191521286e.tar.gz linux-500050f0d28868af302a3c24d7d1d0191521286e.tar.bz2 linux-500050f0d28868af302a3c24d7d1d0191521286e.zip | |
Merge branch 'fixes-omap3' into fixes
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 7cbd024e3e63..c83c2c6564e0 100644 --- 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; - PyMODINIT_FUNC (*initfunc)(void); #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 - 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]; + PyImport_AppendInittab(name, initperf_trace_context); #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); + PyImport_AppendInittab(name, PyInit_perf_trace_context); #endif - - PyImport_AppendInittab(name, initfunc); Py_Initialize(); #if PY_MAJOR_VERSION < 3 |