diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-19 03:37:07 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-19 03:37:07 +0300 |
commit | ab1c247094e323177a578b38f0325bf79f0317ac (patch) | |
tree | 97ff10609587158d6f726f5d1b118b13339501d9 /tools/perf/util/bpf_lock_contention.c | |
parent | 71225af17f611632226a4a2fae25235fd8dad268 (diff) | |
parent | 2cf4f94d8e8646803f8fb0facf134b0cd7fb691a (diff) | |
download | linux-ab1c247094e323177a578b38f0325bf79f0317ac.tar.xz |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes that went thru perf-tools for v6.7 and to get in sync
with upstream to check for drift in the copies of headers, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/bpf_lock_contention.c')
-rw-r--r-- | tools/perf/util/bpf_lock_contention.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lock_contention.c index e105245eb905..f1716c089c99 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -12,6 +12,7 @@ #include <linux/zalloc.h> #include <linux/string.h> #include <bpf/bpf.h> +#include <inttypes.h> #include "bpf_skel/lock_contention.skel.h" #include "bpf_skel/lock_data.h" @@ -250,7 +251,7 @@ static const char *lock_contention_get_name(struct lock_contention *con, if (cgrp) return cgrp->name; - snprintf(name_buf, sizeof(name_buf), "cgroup:%lu", cgrp_id); + snprintf(name_buf, sizeof(name_buf), "cgroup:%" PRIu64 "", cgrp_id); return name_buf; } |