mirror of
https://abf.rosa.ru/djam/kernel-6.7-xanmod.git
synced 2025-02-24 17:42:49 +00:00
61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
From 2a99dddb5fa823af36cb38a417a0a137dedde870 Mon Sep 17 00:00:00 2001
|
|
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
|
|
Date: Tue, 24 Mar 2020 15:38:40 +0300
|
|
Subject: [PATCH] perf,zstd: use %zu to print size_t values
|
|
|
|
Otherwise the build of a 32-bit kernel complains as follows:
|
|
|
|
In file included from util/session.c:17:0:
|
|
util/session.c: In function 'perf_session__process_compressed_event':
|
|
util/session.c:91:11: error: format '%ld' expects argument of type
|
|
'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=]
|
|
pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);
|
|
|
|
...and fails.
|
|
|
|
Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
|
|
---
|
|
tools/perf/util/session.c | 2 +-
|
|
tools/perf/util/zstd.c | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
|
|
index d0d7d25b23e3..55c3d2fefd41 100644
|
|
--- a/tools/perf/util/session.c
|
|
+++ b/tools/perf/util/session.c
|
|
@@ -88,7 +88,7 @@ static int perf_session__process_compressed_event(struct perf_session *session,
|
|
session->decomp_last = decomp;
|
|
}
|
|
|
|
- pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);
|
|
+ pr_debug("decomp (B): %zu to %zu\n", src_size, decomp_size);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/tools/perf/util/zstd.c b/tools/perf/util/zstd.c
|
|
index d2202392ffdb..b5d29399cc9b 100644
|
|
--- a/tools/perf/util/zstd.c
|
|
+++ b/tools/perf/util/zstd.c
|
|
@@ -74,8 +74,8 @@ size_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t
|
|
ret = ZSTD_compressStream(data->cstream, &output, &input);
|
|
ZSTD_flushStream(data->cstream, &output);
|
|
if (ZSTD_isError(ret)) {
|
|
- pr_err("failed to compress %ld bytes: %s\n",
|
|
- (long)src_size, ZSTD_getErrorName(ret));
|
|
+ pr_err("failed to compress %zu bytes: %s\n",
|
|
+ src_size, ZSTD_getErrorName(ret));
|
|
memcpy(dst, src, src_size);
|
|
return src_size;
|
|
}
|
|
@@ -99,7 +99,7 @@ size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t src_size
|
|
while (input.pos < input.size) {
|
|
ret = ZSTD_decompressStream(data->dstream, &output, &input);
|
|
if (ZSTD_isError(ret)) {
|
|
- pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n",
|
|
+ pr_err("failed to decompress (B): %zu -> %zu, dst_size %zu : %s\n",
|
|
src_size, output.size, dst_size, ZSTD_getErrorName(ret));
|
|
break;
|
|
}
|
|
--
|
|
2.24.0
|
|
|