From nobody Thu Dec 18 14:07:15 2025 X-Original-To: dev-commits-src-main@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 4dXCCm0St1z6L11S for ; Thu, 18 Dec 2025 14:07:16 +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 4dXCCl733tz3RNb for ; Thu, 18 Dec 2025 14:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766066836; 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=sNfpSVyX5xwSKh6ad0Sqm9d6oQxfYrGDfm3hpyIf7GY=; b=Vp9tGLOxrwZGzP5m/4vzT6ZNq3rksLEB2RyrS/errudPB1LZejjB12EHnhd+Rh4/nXBiq+ PKu5QPo6HlH4MUBvVLYNzcgevS3dz4+MePIivm2Cw7Ll+sTuSIho07po6C8wXw3mDN3gzI liGNuXCxJ23dGaDaVjHtmuX6JvGry2qXLi8dgDVmIEhVkqcRWcFq9Odxcmsha/atP+EDUo bE7+zn3j6abEwVvOTYbzNueRUGEzLdCmNLcjlreeuU+NGgRBFdwhbTkOANNjCDU3fS6Wsh Il2+RRIWZCDAjKRhCgYoarNdFHUyaA7ibwOv5tSEVvKyTf81xQDRMnu0g9Cs2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766066836; 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=sNfpSVyX5xwSKh6ad0Sqm9d6oQxfYrGDfm3hpyIf7GY=; b=foRCr63cmBYefkvZxN8M42gyzBaIraamlLaaEDc44f1SHDMYNZQ64VnLY9Q6Xm4ZapLiwn /SDE+AZpjixcmz/J5jReBorxQ8QkxlRxTb47CeYyPRl48/9x5GJV28RjlvE4rDImB3vxEz FfBbKWg1fi5uNleofFxF4ZK6fgTNReW/63SfmSdaOVk0uUusRReR1hI3oVf0uUySzS17Wu VcY8X4kB6i5Lv1JD7XM+NxGR9ZZtmkBnFOXW/vdL7zbyaULfl1+zaA+WkC0Q2rvh+TDbnd BE+al1Z0VUlcIJdoH3QkKzQUg7BIfpwALUW5JpitjvxmWO9ePJ1l13LP4ZrK0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766066836; a=rsa-sha256; cv=none; b=j36Wk8Zt+/bEmdMjwwg2EfsDZagyaiknDVHfA9nm3AJDPb54SGU0ckFklX+k+5dZkKFH43 SVQ4zTaMgC1LaNftyGthjYQ1f/8b15BqlidNFqfpWXtUpdUhc9zJSMk17/Uwo26osgLzd+ z2EYESsrWaUBgOeTtnLTcUiXV/vxIfFECVFkTz0ZuXHbBKeRIIzjDrZi81g3SYdqmLAaFg kBAxf+ByrL+PjcT7L+Z3nWM+9LpfamgEwanDWg3WGNbTdT4UN/WxFsT5rl+WqPLRrq4M5G m44wViQ9y8qKsAke8zaYAS20vCgtQrwW7ffNm7+a76K9fTl3FIxndrfHA/Pomw== 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 4dXCCl5rJnzhdh for ; Thu, 18 Dec 2025 14:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34cc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 14:07:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a8be81456cfe - main - jail: Don't define malloc type M_PRISON_RACCT on !RACCT 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8be81456cfeecc66ba3b41eb9a2d3dfea7ebc8c Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 14:07:15 +0000 Message-Id: <69440a93.34cc0.901ff2@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a8be81456cfeecc66ba3b41eb9a2d3dfea7ebc8c commit a8be81456cfeecc66ba3b41eb9a2d3dfea7ebc8c Author: Olivier Certner AuthorDate: 2025-12-02 14:39:33 +0000 Commit: Olivier Certner CommitDate: 2025-12-18 14:07:00 +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 --- 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 07b98fef8dfb..f803be76a70e 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -83,7 +83,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