Merge tag 'riscv-for-linus-5.10-mw1' of git://git.kernel.org/pub/scm/linux/kernel...

[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 2c372cf5495e5537c6948ff62f87b12313e91a61..7cbd024e3e634433a22b105d746d147c69a66153 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -741,7 +741,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
        if (!dict_sample)
                Py_FatalError("couldn't create Python dictionary");
 
-       pydict_set_item_string_decref(dict, "ev_name", _PyUnicode_FromString(perf_evsel__name(evsel)));
+       pydict_set_item_string_decref(dict, "ev_name", _PyUnicode_FromString(evsel__name(evsel)));
        pydict_set_item_string_decref(dict, "attr", _PyBytes_FromStringAndSize((const char *)&evsel->core.attr, sizeof(evsel->core.attr)));
 
        pydict_set_item_string_decref(dict_sample, "pid",
@@ -968,7 +968,7 @@ static int python_export_evsel(struct db_export *dbe, struct evsel *evsel)
        t = tuple_new(2);
 
        tuple_set_u64(t, 0, evsel->db_id);
-       tuple_set_string(t, 1, perf_evsel__name(evsel));
+       tuple_set_string(t, 1, evsel__name(evsel));
 
        call_object(tables->evsel_handler, t, "evsel_table");
 
@@ -1064,7 +1064,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,
        char sbuild_id[SBUILD_ID_SIZE];
        PyObject *t;
 
-       build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);
+       build_id__sprintf(&dso->bid, sbuild_id);
 
        t = tuple_new(5);
 
@@ -1349,7 +1349,7 @@ static void get_handler_name(char *str, size_t size,
 {
        char *p = str;
 
-       scnprintf(str, size, "stat__%s", perf_evsel__name(evsel));
+       scnprintf(str, size, "stat__%s", evsel__name(evsel));
 
        while ((p = strchr(p, ':'))) {
                *p = '_';