From nobody Thu Dec 18 14:07:15 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 4dXCCm0MWXz6L1fp 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 4dXCCl6TXsz3RQw 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=1766066835; 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=UpRoM8qvjwXYwoamEnDYKBvlHp4Iy+DJANwhTy9swvsqjkBE+oMGXz6F7h7NXFVJSPic2B unPuWeO4sYkIGBtnFsdee7AMGEuCbpuJF2zSDXVnSLti1K2OH0kQY/ZTupflcJA0iXR5Hj CzFWRd3iL//cIBrmj983zXnueYChc30HgUvvBgpMycC4DtUn8zcq1P1WjKbl6Z+uEjB8kD m5Rp3llCAXL3L6RtOkiVJfaCkoEt5y08uLNQoUfEJ07ow/G9kw1Vbz8LcD+TnC80yq6+Xc p8wCI7/RQQdWhEm13oEiEGyy+Rlb4wsP4lB/m+bIrntGBxd8XF6uL98I75nB4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766066835; 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=OsINgz/AjAkmzu5aHg1CqJD0suAkaqZjcGooQjqbwkWMhITbGLN8njlQEmnv5OKsk8yeoQ EwA+jJcdQPrYi2xFSndVIiBG4BmkXT+OXz1JPBLJ3WDfYSQHP1ZvA4M2UlAi4xGTjN68UJ +/IfmPMlIjmMOeBFvyaPkkCbrmWWoGPMC55MMGjAqSJiKdK4G5XOCIWkaogNsZE5QT5T00 1ZxLynhCBBOGpVtjCOcGQsjzr24pZ0Ayg/yhp3c4agXd1KumR+xm2F0k131sxBrFgo0JDQ HHip7XTFUjG9hmfLdcyxJzFuJsRvFLTYDOn9xhSl0Z3mHVo1dY1+kO96PY/k1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766066835; a=rsa-sha256; cv=none; b=EbXfRw/7Ee4E8oOUGHz4z7XB0nVvRJK0+sptKbx/dB/tCeBUA1s3kY7iahB7TWBmZXrNXm 2oIVC/G4HvEtPeI58AO3IaK1j6ZeM+PCMqpowo5Ebx6XPjJVfnc2L9rZEeBOcCEzXSrl7+ ZCpB8cbwZTXNE+xH6Nv9ykhlXo8rwIqnXW5UZqZnKT8EtAnmAcLrQGSZKzIiU64ePb6kyC vkps7MlcNQYYA9SvcRWfPLgToJLByjzIP6VF6xWqzT4PfcO4f0yhEG5CkggHalyZLJirFg Vu0rC3ZUSvc6dRe0enz0v5kGKpc6CxRMxblrGYSgpJEIvpCs4aWZ28nD6o7R9g== 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 4dXCCl5ppLzhg2 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 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/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