-transfer-encoding:content-transfer-encoding; bh=ZBVHY8gHQKkrCxfFsu4853lmtR7ciyqjc4rdBxv4x5E=; b=xHnbUzm6qnvnEESQBJTp0/hrjVxZ6DZy/W1t55Jva3pJZJrAKH421kXqkRi2JeGOOcfOzp q0p0Sc2Cs8J77vo8prpZSeW0jFMx9mYjLTncQ+PUSn2wfQPXWDdiGaDlkd6OgbD0402dFC FsSBkG7XvbTRf5VJgDCCf5Bu7OEDwkd5CYA3i3Sm2dKP03TaZSN0nDfFirRw3AZjGk6DGN zaq5t1P1hUB5fuFacILnMsEa+2SmMoakOPA7XFnZa4U76SHYcmBWaoOF0hu+7+DLUjeozE mMZU0VAF62NBZtQMDnyR5hNSQNPsXnReOgr+1XCvw997aa2KsRPf6fOoq53KaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766065658; a=rsa-sha256; cv=none; b=eKHw4jqIt3dyAmvv49vFFYCm7Y7xQpSN/OcZ8v48Firuqxi2bC0daG/B5PNqvfukzZCOm4 65LHnfRgbB5z0JEh2TkWzsYby8iIjcdtdpJmSOvU4ZS4NepH8BbhrpN6pqQa9s8VEBbNNX DpoQ6Z1Nyw+Fe/Ia5h4zIDky7qA+FaX5nFsfg/5c8hlKnkc1PP6SqidM8nqw8nov0UT3Qh GgF2udHExmj1yplT1a8AXb90RDZTDfteJldBKEKeLmya/IfCGn/yHwkKov0feOkFXck43h hwHtb/3vEa9Ik9O1yXkC874RUfNCmKPRN82DruMmr6GVqoqiIowBrQk/50ZiKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXBn64mrQzhM8 for ; Thu, 18 Dec 2025 13:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 13:47:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 377e6050c1cb - main - vmem: Fix the gcc build 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 377e6050c1cb9edce90d2a3caa2833fcc09b8c68 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 13:47:38 +0000 Message-Id: <694405fa.33ba7.3a4b0eaf@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=377e6050c1cb9edce90d2a3caa2833fcc09b8c68 commit 377e6050c1cb9edce90d2a3caa2833fcc09b8c68 Author: Mark Johnston AuthorDate: 2025-12-17 20:54:40 +0000 Commit: Mark Johnston CommitDate: 2025-12-18 13:47:29 +0000 vmem: Fix the gcc build gcc complains when building libuvmem because the last two operands of ?: in ORDER2SIZE and SIZE2ORDER have different signs. Add explicit casts to address this. Reported by: Jenkins Reviewed by: alc, kib MFC after: 1 week Fixes: 1ecf01065b45 ("libuvmem: usermode port of vmem(9)") Differential Revision: https://reviews.freebsd.org/D54268 --- sys/kern/subr_vmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index afc327c512ce..8b834a2e2a79 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -285,10 +285,12 @@ static LIST_HEAD(, vmem) vmem_list = LIST_HEAD_INITIALIZER(vmem_list); #define VMEM_CROSS_P(addr1, addr2, boundary) \ ((((addr1) ^ (addr2)) & -(boundary)) != 0) -#define ORDER2SIZE(order) ((order) < VMEM_OPTVALUE ? ((order) + 1) : \ - (vmem_size_t)1 << ((order) - (VMEM_OPTVALUE - VMEM_OPTORDER - 1))) -#define SIZE2ORDER(size) ((size) <= VMEM_OPTVALUE ? ((size) - 1) : \ - (flsl(size) + (VMEM_OPTVALUE - VMEM_OPTORDER - 2))) +#define ORDER2SIZE(order) ((order) < VMEM_OPTVALUE ? \ + (vmem_size_t)((order) + 1) : \ + (vmem_size_t)1 << ((order) - (VMEM_OPTVALUE - VMEM_OPTORDER - 1))) +#define SIZE2ORDER(size) ((size) <= VMEM_OPTVALUE ? \ + (int)((size) - 1) : \ + (flsl(size) + (VMEM_OPTVALUE - VMEM_OPTORDER - 2))) /* * Maximum number of boundary tags that may be required to satisfy an