diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:01:40 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:01:40 -0300 |
| commit | 4151687a6d3d0c6454b08b9cbf7bb34971c4fb67 (patch) | |
| tree | 7c28723503ab750ebde80169a5b7ec261bc80a8e /tools | |
| parent | c706fb45b357f4f63826b890732a3ed0da184ebf (diff) | |
| parent | dd20085f2a88b6cdb12bdcdbd2d7a761c86b184a (diff) | |
Merge tag 'v5.15.68' into 5.15-2.1.x-imx
This is the 5.15.68 stable release
Conflicts:
drivers/soc/imx/gpcv2.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/builtin-script.c | 3 | ||||
| -rw-r--r-- | tools/perf/util/machine.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index cb3d81adf5ca..c6c40191933d 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -435,6 +435,9 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) struct perf_event_attr *attr = &evsel->core.attr; bool allow_user_set; + if (evsel__is_dummy_event(evsel)) + return 0; + if (perf_header__has_feat(&session->header, HEADER_STAT)) return 0; diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 44e40bad0e33..55a041329990 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -16,6 +16,7 @@ #include "map_symbol.h" #include "branch.h" #include "mem-events.h" +#include "path.h" #include "srcline.h" #include "symbol.h" #include "sort.h" @@ -1407,7 +1408,7 @@ static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, i struct stat st; /*sshfs might return bad dent->d_type, so we have to stat*/ - snprintf(path, sizeof(path), "%s/%s", dir_name, dent->d_name); + path__join(path, sizeof(path), dir_name, dent->d_name); if (stat(path, &st)) continue; |