From nobody Tue Jan 6 14:18:44 2026 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 4dltZD4pD1z6Nh5w for ; Tue, 06 Jan 2026 14:18: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dltZD2Wymz3c1P for ; Tue, 06 Jan 2026 14:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767709124; 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=AACbNVmMMgZHTq1ankuDmjS7jeLDmryDxtm2msCCm+4=; b=NOArYK0+ZgvnJgJ/Fha2f8bPy0VOcUxo2/4qYOnJZJoMtR/dZtBiGLzMxHmNuSl3z5Zb4F gdFHce7IOP2X4nSX16KK2r92PDHdrgSEBXSdzn0toSFfJ4yxG3PkGbBx3v4Tu/4Uq+Ah5N Sd+vnvsLiTwgJVJkhXJk053VItt5bm6EBDF0ojOoGqnB/8mdmOeJ0o4FlPn8XAmJIr/5hH rfmsi04BkucnsM5IU8xjJ+HCNFFD5okeJYHJ4NDQA5IqRvL549+keDbvqNF6JbLS4r9TpK ad2Mzi7kjo7gpSKus7eMOcUWOdI4q3iY9Xf5auUkEsGKAc0vrdPcYa0ozlczFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767709124; 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=AACbNVmMMgZHTq1ankuDmjS7jeLDmryDxtm2msCCm+4=; b=sbXqoBJWpKKlJYY+FkWSY8TGWsx1WhRLH2mrvK9SkwenMVh4a9OwEKGkuZery0zXTppRh7 K4V58vbgST0bJsNIwQiWEx7mW0hSBheSkJozkGlv5TgmTOdi6TvbI2X7JU0wDaR+birgVb lZowfoXIEWMyLFSvXWPaIFhCeRL2Hj4tCt0p7uRER9o0t1y6BdOIKQLl1R1Mv7LpbZuj/V X2m+nH/8hD7n+b9j5snW1BikRasH20Jr3Pnr4qUAWZZFbQ+8KvBx95jyDGp7TK+x1K/a/v CjS/SizqrN9wWTlhDRPmNoBKeihh/RWolPTL5MPXWywUgm7Aoan4mWGLm1vuBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767709124; a=rsa-sha256; cv=none; b=V1drjRRW3qUxr6PQZsdeNigGOTJZIO9Yq2HwJLStZPbYGEasmMrSJUHktw/2Juxgc5ZPc1 tTCLD4r0qC9fkVvvrlTWdPrHNO8EfQ2IduQJ35Rc1cktqE/wS3hJq9s6PAQWVHJsZ9vbuE hr1Dmy6Oz+79I2lFg1alVWSofGPTVrrdb+vMsmMRXJKJFV2MAD8FVtTTjmvTjea9l6cF4u 6GlAC0wNk2yCOOTNl8ykbxYykOmG3AWDUy5ID4iOLJA1QcQlZkPd9JMqfjtF84klLhDAGp rk+1Eq1n7zdu+U2D6WoAfe8I0Onb+deac+SU2bm8ydxlTdvU2b4JM0ApQBMd+g== 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 4dltZD1LtJz192M for ; Tue, 06 Jan 2026 14:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a6a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 14:18:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 4e4272024e33 - stable/14 - jail: Don't define malloc type M_PRISON_RACCT on !RACCT 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4e4272024e33d06f0b38a7d93c1c65b779220d13 Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 14:18:44 +0000 Message-Id: <695d19c4.a6a1.10c343cc@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4e4272024e33d06f0b38a7d93c1c65b779220d13 commit 4e4272024e33d06f0b38a7d93c1c65b779220d13 Author: Olivier Certner AuthorDate: 2025-12-02 14:39:33 +0000 Commit: Olivier Certner CommitDate: 2026-01-06 14:18:11 +0000 jail: Don't define malloc type M_PRISON_RACCT on !RACCT Reviewed by: emaste, jamie MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54271 (cherry picked from commit a8be81456cfeecc66ba3b41eb9a2d3dfea7ebc8c) --- sys/kern/kern_jail.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 54b06ba803c5..03a5eaabdf34 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -80,7 +80,9 @@ #define PRISON0_HOSTUUID_MODULE "hostuuid" MALLOC_DEFINE(M_PRISON, "prison", "Prison structures"); +#ifdef RACCT static MALLOC_DEFINE(M_PRISON_RACCT, "prison_racct", "Prison racct structures"); +#endif /* Keep struct prison prison0 and some code in kern_jail_set() readable. */ #ifdef INET