From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FC30C47259 for ; Fri, 1 May 2020 08:15:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AE0B2071C for ; Fri, 1 May 2020 08:15:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728426AbgEAIPg (ORCPT ); Fri, 1 May 2020 04:15:36 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:7601 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728325AbgEAIPf (ORCPT ); Fri, 1 May 2020 04:15:35 -0400 X-IronPort-AV: E=Sophos;i="5.73,339,1583164800"; d="scan'208";a="90959647" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 01 May 2020 16:15:29 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id BAA474BCC89C; Fri, 1 May 2020 16:15:27 +0800 (CST) Received: from G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.200) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 1 May 2020 16:15:29 +0800 Received: from TSO.g08.fujitsu.local (10.167.226.60) by G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 1 May 2020 16:15:28 +0800 From: Cao jin To: CC: , , , , , Subject: [PATCH] perf: fix compilation failure on i386 Date: Fri, 1 May 2020 16:15:27 +0800 Message-ID: <20200501081527.4343-1-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-yoursite-MailScanner-ID: BAA474BCC89C.ABF2A X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Compilation on i386 complains as following: 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); ^ util/zstd.c: In function 'zstd_decompress_stream': util/zstd.c:102:11: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=] pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n", ^ util/zstd.c: In function 'zstd_compress_stream_to_records': util/zstd.c:77:11: error: format '%zd' expects argument of type 'signed size_t', but argument 4 has type 'long int' [-Werror=format=] pr_err("failed to compress %zd bytes: %s\n", ^ Fix them by pairing "%zd" to size_t. Signed-off-by: Cao jin --- 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 0b0bfe5bef17..50c2ffa388ad 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): %zd to %zd\n", src_size, decomp_size); return 0; } diff --git a/tools/perf/util/zstd.c b/tools/perf/util/zstd.c index d2202392ffdb..877bfb79e4af 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 %zd 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): %zd -> %zd, dst_size %zd : %s\n", src_size, output.size, dst_size, ZSTD_getErrorName(ret)); break; } -- 2.21.0