From nobody Tue Apr 4 23:36:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PrkfW2ZCwz43P2Q; Tue, 4 Apr 2023 23:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PrkfW1Xz7z3H1C; Tue, 4 Apr 2023 23:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680651363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YicCRntG2xW2lwzmeXWTBZ+q511mEdcfWOV9i1iAxlE=; b=tqHbwKC94f+2rApixFpH8YZPJvnVX9uqja5l6KBsn9mL8ZWe0iHWdXbS00xJH5Lgi88t5m AkwI+rd1IfEWGeDtJX8uLDk594Eo2RVINfDFsOkpPj0M1PuWayECr/wdYZzKfELqtl1Myi zA0RZzl7BYa9ISujoediv8YW6fyBQIqeqJwgwiWOSEPYcCpRMbyzJxHeVmLOtOaJ4imbfu 7E+o1sobRl6gK3TnUJmhV7H0zKlZ630bVjj1TCKqC/khQ84CDkGWIm54uYhd7+a6VaL4ai x9HuQjMHJnR7YUwaWSBnmoi05tS6MyA1Mjqr1IugVBOXtgWqvDHjtxUideXcvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680651363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YicCRntG2xW2lwzmeXWTBZ+q511mEdcfWOV9i1iAxlE=; b=CdGTVmCYJ4VARTC2etXcFIgxqv3tXLoZevJI1ZZdSaAeaTnBWGeiC4DDSnxxUapWTMVwgy ojZbbVsY7QnEKmGeq5LpZh0CYgfshRmV7G94MXjjkwecU+mo7HQ7JaFMe6y64rloKvUQbP GyxOazHS1MdoiHO2cv6TIPMolFdk3MWjmfnv5zTdzO8T9x/vGuoEghP6DWvKGHVprY3Yly aq+37bzpalhX1Kl81mjiAfetrY20wi4YE+kLQzEi7F4ox0V71a+3Wo+2lkh65qgzuMzWn8 UrItPKNSSDIi1Cm2mGT/AVRXtxYgGp/Xjp5UBTmRkBHAOa5aadjFTFRQKZ4FVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680651363; a=rsa-sha256; cv=none; b=EmF610/L1av1yVZLmidAiPcYXk3mNbeyzat+8wkWCBreu6MOpgr4tR6YvrnzmHW0J8t6k7 6dD4DyyPZfjWWYUH2eRv4zJgCxhchDjBBQGmAFvYJ7tWEbvJ2Jas0kYvfumyRMX0GCxZNR TW1HCz4vmOtzAZHMKWLwiwF5nmwu/l7picg23iqMt8ChjXBoNqL56RbW8Kv5IXeGC1q6rU VD+HeO60v1iZjSsRBwVE0BolVmZRBCo8Ubdnx9hQNBvkfvs3/69lLPq9FQjZ/eSj4AiupM /04pIlqG7pblVRNHGu8/f/VZo4D0J9ib/fjtbaTpp5oeDTv4IqRNVdUL71JvdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PrkfW0bs6z10VZ; Tue, 4 Apr 2023 23:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 334Na2vn004279; Tue, 4 Apr 2023 23:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 334Na2v0004278; Tue, 4 Apr 2023 23:36:02 GMT (envelope-from git) Date: Tue, 4 Apr 2023 23:36:02 GMT Message-Id: <202304042336.334Na2v0004278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 84b42df8345b - main - rack: fix build on powerpc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84b42df8345bef75c2ffbd4830c2d2e17ea1cdb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=84b42df8345bef75c2ffbd4830c2d2e17ea1cdb4 commit 84b42df8345bef75c2ffbd4830c2d2e17ea1cdb4 Author: Gleb Smirnoff AuthorDate: 2023-04-04 23:35:36 +0000 Commit: Gleb Smirnoff CommitDate: 2023-04-04 23:35:36 +0000 rack: fix build on powerpc --- sys/netinet/tcp_stacks/rack.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 514d10098ff6..3fc0bb65bbf8 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -5505,7 +5505,8 @@ do_rack_check_for_unclamp(struct tcpcb *tp, struct tcp_rack *rack) if ((rack_unclamp_round_thresh > 0) && (rnds >= rack_unclamp_round_thresh)) { snds = tp->t_sndbytes - rack->r_ctl.last_sndbytes; - KASSERT ((snds > 0), ("rack:%p tp:%p snds:%lu is 0", rack, tp, snds)); + KASSERT ((snds > 0), ("rack:%p tp:%p snds:%ju is 0", rack, tp, + (uintmax_t)snds)); rxts = tp->t_snd_rxt_bytes - rack->r_ctl.last_snd_rxt_bytes; rxt_per = rxts * 1000; rxt_per /= snds; @@ -7033,10 +7034,10 @@ rack_adjust_orig_mlen(struct rack_sendmap *rsm) * compensate for this change. */ KASSERT((rsm->orig_t_space > M_TRAILINGROOM(rsm->m)), - ("mbuf:%p rsm:%p trailing_space:%lu ots:%u oml:%u mlen:%u\n", + ("mbuf:%p rsm:%p trailing_space:%jd ots:%u oml:%u mlen:%u\n", rsm->m, rsm, - M_TRAILINGROOM(rsm->m), + (intmax_t)M_TRAILINGROOM(rsm->m), rsm->orig_t_space, rsm->orig_m_len, rsm->m->m_len)); @@ -18248,10 +18249,10 @@ rack_fo_m_copym(struct tcp_rack *rack, int32_t *plen, * compensate for this change. */ KASSERT((rack->r_ctl.fsb.o_t_len > M_TRAILINGROOM(m)), - ("mbuf:%p rack:%p trailing_space:%lu ots:%u oml:%u mlen:%u\n", + ("mbuf:%p rack:%p trailing_space:%jd ots:%u oml:%u mlen:%u\n", m, rack, - M_TRAILINGROOM(m), + (intmax_t)M_TRAILINGROOM(m), rack->r_ctl.fsb.o_t_len, rack->r_ctl.fsb.o_m_len, m->m_len));