From nobody Thu Dec 18 13:47:38 2025 X-Original-To: dev-commits-src-all@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 4dXBnD11fkz6KyfD for ; Thu, 18 Dec 2025 13:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXBnC5NF5z3Nx7 for ; Thu, 18 Dec 2025 13:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766065663; 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=ZBVHY8gHQKkrCxfFsu4853lmtR7ciyqjc4rdBxv4x5E=; b=Xnko+CmTOWtm8z+M49S/1j2xtB+hoedCII1b/KLqV8spaUQyz3qVjyG5ilPdyuLRjTJ3lD 3mr+biSdt39yCpHCoc0kHBmzCzDpYbBJuLWsd6ZY8zT2gr8w9EB00ahasq6aUc3gubz1Jg ZT0+KKUd2H/ESrgg/15wfMiEchoa0B3H0DV/n3ArmfrRFI68PuKvDl2x5mDvBoPZvW5WSo Lm0tS/3OLycmZPZPbZnFSe6bhzr14J/Z0se0M6lchFI/+YhoHzQDPYZH3dpz0EaEd1D6BP itjEFZgfdMcFI/Hxf8ortAVjeAYlOmAGHYrwHRuRjEI6NOmyxY5IDNfF76b2Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766065663; 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=ZBVHY8gHQKkrCxfFsu4853lmtR7ciyqjc4rdBxv4x5E=; b=GEFYKSvevMRrLkjKR9pQQvHIUhSFzCG4yq7aMjglGgUvpXQvv8zyYBD+ssG6GOa8pgN/Mo P8hj0sa03TjL2xx5GvHdjwZlU6SXR6Gn6eTXKrUBVw6rce7wamga2eujDXr7Ww6G7RJTzQ jATyKFH/vriq6j5Okhi7SArGFHZw4yCJOg3C019KEb2l3uz3keiw0P7CSfxskgPYljSxCL HNwCAhhDV8IMxE/dLpBWznS9f3DRRuwgT/wevsjHTPDZycUTEGOeQodyGgcsxiwa+o9Vs4 XV8AnbbOKTBVftDfMquJ02BS6HN3dA7eE2JLVRjo2SbX+gnaVvI7CtQvFlhcCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766065663; a=rsa-sha256; cv=none; b=GIT2XrTvP6qRkoJXdOW4cn5rCz+pAWf5dr2ioxTJN0CPAegzDbgyVYx6floIQoqH6zFE3S MKdVSsI/VjONPL+85hMrOUo9AqEa2LgFhQkEbwvAXrOJGiybiSvyR/VDk6eF0Bc9BoZOug 3XrwWv7mSyjz2coCfPciW5JpHUBoEc5XrY6dh8EEbe5A/3L4YLUQ1/MkYKwAy4aAI4sG3w FKtKw07YXqzsDKZgFE2z+tyzLR+unJsiJ+Z68o0XJxGUwvB0BjgC5gYP0WUCfwS6xAgOl7 29AOZXWkuq4GCk4TJTMnbtkfWUQxhJU81PPLmAxMvy909+U8JMfHtxP8nEPZyw== 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 4dXBnC4mNdzhJy for ; Thu, 18 Dec 2025 13:47:43 +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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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