From nobody Thu Dec 23 08:05:29 2021 X-Original-To: dev-commits-src-branches@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 E1AB11904DD1; Thu, 23 Dec 2021 08:05:29 +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 4JKN6K4bf5z3DlS; Thu, 23 Dec 2021 08:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7F89D4EA8; Thu, 23 Dec 2021 08:05:29 +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 1BN85T39057418; Thu, 23 Dec 2021 08:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BN85TkW057417; Thu, 23 Dec 2021 08:05:29 GMT (envelope-from git) Date: Thu, 23 Dec 2021 08:05:29 GMT Message-Id: <202112230805.1BN85TkW057417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 39816676b6c6 - stable/12 - Correct type size format error in KASSERT. Reported by: jenkins Fixes: 6f1c8908272f vm: Don't break vm reserv that can't meet align reqs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 39816676b6c6a461ed8bcf9311058054383a82db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640246729; 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=AQSQDq5qslE50mZDzPge4p6MKBrJn9UnOCJeEoSf1LQ=; b=Dg1iqjXJeW3DPQO3lVREZOrZS4CdxeaAHp3tqtqhTdh/ItxH+z1ztI8zEEBLUtYntg3hfH WgIPUm3EZdcPjjUxh5D2tZt953dLxAqHrHpypXrL4kMEnxD97W+ZRrTY2E4K7aHYb2cj6o 3H6wytEexebdmrlBnKFzxRNGyGFQGIaVSwMsFXZw7UVr7AzVgrDYEMcp6gD3qK0BF48Lis A61G5ITRZtgp3ujjvTlK1N6sEQC8imA3N2IEcuXxbeKVKo9olk46u8U/SZzZs+9ka3xBvF JroSDA7Cca6+n/TzOCBWHTg2a9V906JJczF9GgiVQ2JkvX4tHMNjGJFonYR1oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640246729; a=rsa-sha256; cv=none; b=SOK/i+JlTHWiKji2K1GvTb4hNe2iE2lG5ljQynK4BFCbbW+y5gjcmwknAfDYdNLs0l2HwK 3sR+KxybGX9BcDsFz47BQWHgA43sno7zsNIo3BtXGjrETAA7XATYGovUUBcrdE3qd27IE0 OvZ2KQzF3G2mdQ/ryoVD54FkrSbCPGIgjLpab5eka3vCQTfpCnIh8Pb/8hvzwZkxao7qGW r7I/fZe7xpTY9JyNIUOdFZf6f7nh1f1hm9+Gcuv39pUGyabuJyf2zEvGNPGxbHeoKm/W02 h3VF6H0AYhWXGDlOowwW2mz+6HJdTiHHeSoHOqGKbDPwzCmwq20S/TlNy6IG2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=39816676b6c6a461ed8bcf9311058054383a82db commit 39816676b6c6a461ed8bcf9311058054383a82db Author: Doug Moore AuthorDate: 2021-12-16 19:48:58 +0000 Commit: Doug Moore CommitDate: 2021-12-23 08:05:18 +0000 Correct type size format error in KASSERT. Reported by: jenkins Fixes: 6f1c8908272f vm: Don't break vm reserv that can't meet align reqs (cherry picked from commit f7aa44763d20d06c9ea5caf330aca02a8b107a70) --- sys/vm/vm_reserv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c index 3e88a696496e..189023257d07 100644 --- a/sys/vm/vm_reserv.c +++ b/sys/vm/vm_reserv.c @@ -1480,8 +1480,8 @@ vm_reserv_reclaim_contig(int domain, u_long npages, vm_paddr_t low, ("%s: adjusted address does not align to %lx", __func__, alignment)); KASSERT(((pa ^ (pa + size - 1)) & -boundary) == 0, - ("%s: adjusted address spans boundary to %lx", - __func__, boundary)); + ("%s: adjusted address spans boundary to %jx", + __func__, (uintmax_t)boundary)); vm_reserv_domain_scan_unlock(domain); vm_reserv_reclaim(rv);