From nobody Mon Dec 29 17:07:16 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 4dg2hP37wjz6M3mM for ; Mon, 29 Dec 2025 17:07:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hN648Sz46vk for ; Mon, 29 Dec 2025 17:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028036; 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=mfBfp7TucXloGaDgdVNsnxRwBiTw+9C4sR95F4Z4naM=; b=INO2a+f7eeEP9Oi8S+dCit5mq1dUmr9gotJCpzeHRt7m44313SQNbFwa3HGgdd57aP7xWb KIzz9qqyk4PxMBra/OHcEtU89wOArB3/nu90QzdnKkmgYGyDzW2HXqbreoDqnYN0Miabwi GDc79qbeVnOYyugA9yxy3Yn6dlBGF2TtH8KRRZSSAJ1Qz7Tdd0SY5WNoSIFe7xJvcaK+2f 5YVcykzZejuFyIYxVyXOXl4FgPRJTMhOnxCLqz05K2+WZtVEY5hGV+xuCAIWpSyI6qESWJ VHCE2vZmDOJ3wUqNs9PMi9iXFMxLaYXXHdTV6pfA4e4SgDFYXFw9y4vE+OoTAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028036; 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=mfBfp7TucXloGaDgdVNsnxRwBiTw+9C4sR95F4Z4naM=; b=CHQyL6hsfBkxnIYbptfnPuoydGztb4aiEyxZK6LxabTYML77hOWaQ4ZO1REzMtcMaOQSIa C2TaUaYXbpHlFHEPHeioHXb1NK45CzZYl529ooVdF+87d+/sP2z0dc644ypNoEDGYRZFku wdH6GrD9r+AcJE276K87FbUw9gBMa2LOvNRsKToeuO+G20H1GdCvXQ0stLH6ktAIcpxyXM 7YzIZkqN61KGNRC/oTts3FyT3ehNns3SMC9a/Wvrv3oHFlyV+P2WkIIffgQAeDKz8VdWee 6yQOEKJaXo7+Gb05P/ArShz882qZ0ibhFDw593FoWItC4qycP0EzYlnOndceiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028036; a=rsa-sha256; cv=none; b=ur1fGHFo0IHQKVBjXXe2f3fsspkKOb0v2r9eLeHT5rGvF4l7h1nK5kaT/4Gr/2X9AROMVt qrHVAZQNvcSsalGsiGahy5cIvl6JuJYptpNf3WB+1DB5avTtu4kUONubVO2NRdJm3m9gaF I/l6HpQ6KYpqQ3FnBKMD2lZaXtxHbNLPhfE0HF1lVuperm2lQgFAPhiKWSIlBcGSfwrYxx V+Ei+CRI/Fbm2Lghqs+rwzhGIKHuFH37jtCqhPzLY6htA8a0pp7NgZONr74evonpwm0kzq KykiKHaxLFHouyeQGeJjUurZk69eSHaitAg9L/hwuM15UgE1kmkLVj4Fjfeh4Q== 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 4dg2hN5dLPz7jf for ; Mon, 29 Dec 2025 17:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 261cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 859fcbb91908 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 859fcbb9190827a62b1410f5f7ddcb87ef28ce6e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:16 +0000 Message-Id: <6952b544.261cf.77819cbe@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=859fcbb9190827a62b1410f5f7ddcb87ef28ce6e commit 859fcbb9190827a62b1410f5f7ddcb87ef28ce6e Author: Mark Johnston AuthorDate: 2025-12-17 20:54:40 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:50:12 +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 (cherry picked from commit 377e6050c1cb9edce90d2a3caa2833fcc09b8c68) --- 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