From nobody Thu Dec 16 19:54:43 2021 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 1D09218F2F6C; Thu, 16 Dec 2021 19:54:44 +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 4JFN9v69Nyz4jJq; Thu, 16 Dec 2021 19:54:43 +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 B37676337; Thu, 16 Dec 2021 19:54:43 +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 1BGJshW5015681; Thu, 16 Dec 2021 19:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGJshnI015680; Thu, 16 Dec 2021 19:54:43 GMT (envelope-from git) Date: Thu, 16 Dec 2021 19:54:43 GMT Message-Id: <202112161954.1BGJshnI015680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: f7aa44763d20 - main - 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: 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7aa44763d20d06c9ea5caf330aca02a8b107a70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639684483; 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=x5b16CJ/Mc4e6U9jXsSuONKYivjVZ171X4Bd2ArvjRs=; b=iMiRXVPnrpxB6orjXnhiVeFrayONnTnMlnsTBYA4sJqyWBuK03c+oEiSW+NCLPoZFfy7GZ m//zIrYot/EuZc9RlJXMUBJTeV4LkqLUiVNGGzPvWmiZ/19GIiwkEosKwQBS+ej6XCq/80 uu6h01LnEUpA8qKuaor35HWqN5KykdSpIDYeVohQy29jFOgLO9uVXqGnkg9/NrOLWfE7KR zK8tU16leXvMxqbJC2UQ3QoUWIzOfBI9VpeCGT6ynKCw1KZuwddR4hSC6cbyZ/+hGXZ5hK ZIwx/ynueORwbQO13pGybvq+61KJWn7AmOiyX7ul0hK4VpglPx7cbhsy00TfQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639684483; a=rsa-sha256; cv=none; b=ND4Lh19ZOMVV14AakspB74E/2yD58NPHeSgPMgu0JmBxrPvV4LMQfup8f11RTwfrZ1IXd4 wkJ1trvstA/S5jja3h1aeoQAc1zeBVZUObhboyMJsemTzJpXXr9ZY831Bfgv70PFHejUdT lw7FVz7fHTF04KZMOl8UgiRUHHOV8DfJhVDtJ0topagbSZTzkdByb/jrEiCuisNQyEcHIx 9rPgaZo6DAeI/ADSwA8HDFvKmOQ7ulUEDENP1Nje3fmh5ShuifCtRZdDflqAS0i3cCCcVB Yk9d/kkPCSeUESroAx2Kp4sNV82XP0HQNVO09M1vjluzMX1k0aZYoq8215tp/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=f7aa44763d20d06c9ea5caf330aca02a8b107a70 commit f7aa44763d20d06c9ea5caf330aca02a8b107a70 Author: Doug Moore AuthorDate: 2021-12-16 19:48:58 +0000 Commit: Doug Moore CommitDate: 2021-12-16 19:48:58 +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 --- 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 8b5f316cc420..d578d67dbe59 100644 --- a/sys/vm/vm_reserv.c +++ b/sys/vm/vm_reserv.c @@ -1391,8 +1391,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);