diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-11 08:39:35 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-11 08:39:35 +0100 |
commit | 0e42b5fee8a8c5bc173f702b0745da6d9329c714 (patch) | |
tree | a71b0daded5764fcc33b88f9344872c13f4b488e /tools/perf/builtin-kwork.c | |
parent | 386a766c4169006d0e9df44823849930b8995e32 (diff) | |
parent | a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 (diff) | |
download | linux-0e42b5fee8a8c5bc173f702b0745da6d9329c714.tar.gz linux-0e42b5fee8a8c5bc173f702b0745da6d9329c714.tar.bz2 linux-0e42b5fee8a8c5bc173f702b0745da6d9329c714.zip |
Merge 6.7-rc5 into char-misc-next
We need the char/misc fixes in here as well for testing and to build off
of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/builtin-kwork.c')
-rw-r--r-- | tools/perf/builtin-kwork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index f007a9b27065..0092b9b39611 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -1643,7 +1643,7 @@ static int top_print_work(struct perf_kwork *kwork __maybe_unused, struct kwork_ /* * pid */ - ret += printf(" %*ld ", PRINT_PID_WIDTH, work->id); + ret += printf(" %*" PRIu64 " ", PRINT_PID_WIDTH, work->id); /* * tgid |