From nobody Mon Feb 10 14:16:44 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 4Ys68F2xL0z5mDDV; Mon, 10 Feb 2025 14:16:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys68F26bqz43GG; Mon, 10 Feb 2025 14:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739197005; 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=1g2c1gwyqf7LMmbygnDnGnS9+DQkkQKlWiPOJSmjqDk=; b=x9AnbuJohBHYcb9LUPTGPRDp9XIiIa6XQDcW6U5axYgHvpXDeaP/O0r5J9BIkjau11ZHmc UoCTZzn2yuVsaDEOePTwNNCkm1HcbAZjVcg4YmiL8O9269PmviUt+ybWtvMYQFb7/8H0dE 2U6kE59xc/fXvQEfOSvDF364mTV7JlgqerB1HDKTh9mPffsbsjo9eGWH/bAFYo6vaSwdHN aZ2TkCYxwUIS+6ZQm6PgwpdB7F8AHX10dPEqUdeWcDkGHbogQunLztCKFsWTahtJKzyOoj /pcma6zapBrYWRZLozcso7hm+MpBNNxdQYQ/bJA5WK2enHWVBBtK/vyxshenuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739197005; 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=1g2c1gwyqf7LMmbygnDnGnS9+DQkkQKlWiPOJSmjqDk=; b=vYXju3rCXFjBrDLtAtz+jCsFqruR9h9lomUAOpEnde8I6kdMYWqzcO8AULrv6J+qgVvpMH pMI+NaNqCiPGlXOpTtvRKZyP2Am/l0ek1EN0J4vfRVduEfhpmGO41EITDh7nrgIBYX4JrO KSb6LQy6q3U7vlDV3pxeU73U1f4GJ/22/6s/mrHxK3ProMDgm3VFrS1cD+iW94NonRmKvE RG8Q5HT4vmKGs/9ycQWY5gm4YpZHkeElPG0bQF35ZQLEp5O4DYdEVtHn1gi3yLlfV42bt7 pYQIISvvKo7Pvr/rdWkY29ZQx7mcRyGfTo+IZZkZ/wyjZpN2VEXT9g6q14EJPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739197005; a=rsa-sha256; cv=none; b=LOalonz3ie/Ear8c4AF5usJctH3D1OaeUgs8Gs+e6zSGg43It9a5dIiQxr/5WJrKDYRFDp mD2rspqo5yosUkgCaFrHci2pAQaq/HqMVekRRfNk/uGy+qNziY9t0Y+DrNZnB1xefjhTc7 1mW7SsqL0mrhUvM1z4Nrj5mAwA4PLMw5TNliosFEHxswA/3P/SEVV89q3HRINLUfHW/EGM ZS6atZ66a97eZAR+VpP1VHeRHSRtFCPJHC/CEyZUHmnwq+ZGM5zM5nDEZ+WuQnHt8dbDsa jMBi81i0Tb5nzWYKwhzeC4+r91J/P1i6UNiNTx1VvElMItIuQ46cg5hjbieKrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys68F1LWzzDN7; Mon, 10 Feb 2025 14:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEGi6o053159; Mon, 10 Feb 2025 14:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEGiFO053156; Mon, 10 Feb 2025 14:16:44 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:16:44 GMT Message-Id: <202502101416.51AEGiFO053156@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: 2ee9d7dcdbe1 - stable/14 - libkern: don't use MPASS 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ee9d7dcdbe143ad3535723aaeac284c2586a963 Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee9d7dcdbe143ad3535723aaeac284c2586a963 commit 2ee9d7dcdbe143ad3535723aaeac284c2586a963 Author: Doug Moore AuthorDate: 2024-06-03 18:20:00 +0000 Commit: Doug Moore CommitDate: 2025-02-10 14:16:25 +0000 libkern: don't use MPASS Using MPASS in libkern breaks buildworld. Replace MPASS with KASSERT in three places. (cherry picked from commit 08f6f78f81e21b21dd002a9389436b0333cb3488) --- sys/sys/libkern.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 835e5ffaf0b7..a792a61aa8ce 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -193,7 +193,7 @@ static __inline __pure2 int ilog2_int(int n) { - MPASS(n != 0); + KASSERT(n != 0, ("ilog argument must be nonzero")); return (8 * sizeof(n) - 1 - __builtin_clz((u_int)n)); } @@ -201,7 +201,7 @@ static __inline __pure2 int ilog2_long(long n) { - MPASS(n != 0); + KASSERT(n != 0, ("ilog argument must be nonzero")); return (8 * sizeof(n) - 1 - __builtin_clzl((u_long)n)); } @@ -209,7 +209,7 @@ static __inline __pure2 int ilog2_long_long(long long n) { - MPASS(n != 0); + KASSERT(n != 0, ("ilog argument must be nonzero")); return (8 * sizeof(n) - 1 - __builtin_clzll((unsigned long long)n)); }