From nobody Tue Jan 6 13:34:34 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 4dlsbG3Pmxz6NdkK for ; Tue, 06 Jan 2026 13:34:34 +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 4dlsbG16NYz3T40 for ; Tue, 06 Jan 2026 13:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767706474; 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=wUuBlFclsnQtUU6pfzlRfGLey1W512AJccn//8Xl18U=; b=jPI0Hqrz6xmfBvzDI0QsOyYGeC12kxQK8KVjCh9o9ZRfOJPVAuahqLHKHJ2rO9yRuW6pSG r55ZtBlBLe0xqkGRpUawsFo/p1mJwCTUGT0bMiQW8J/OxFKK2/hzNt0+yzyieByEnbxCe8 /brzDN4VqHHfD6Q7Xe5JARylnYOv57Vkn+iEcTAf8kiHvTpnwsfHX1jABGB1vkP+xsxhwl jGUZYL1H8D+UkuCuS7KdJIQpuWWvi7iPAcu0lnWPhU3ZqFlO8NYWck65D9eIWXxRlAfc8E WqwriZbHFqppck/D/1Uc4F92yIQesNk51+HQJGW6dKfwiA/cxxlpqhBicTPedA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767706474; 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=wUuBlFclsnQtUU6pfzlRfGLey1W512AJccn//8Xl18U=; b=vO/EhBktZw69QqsbbtQI2uUs1A6Txpuqx6Rsvny8JYfz/uFJ+/novorDtHdGfvTcr3/fLm d2uy2Ay00w2J71CEfHISON0tSDl/WhtagmojEIH4LRehuQEXjI2qLODRdvGeiygOhaADBN 9JWKihayWMUestN1mqjWo8b6qV9AThEgPDGfKujqjxUq3hGONs85k38XiAOr1d4e2wBEkO qwVV0mlcKoI3pAllsnKTNv3QFWuQAIz9a2DoD2HhYa7OZKkO9bOdiwk8PD3TRKVDIWxvHv ehlNZCPiENh4eESoOTQP+ykF8h67GZFIK02za3u1wfydqSr2GbbqVltmOL/bCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767706474; a=rsa-sha256; cv=none; b=YivjySRg8CKFjigevyISj2506CEUB/VUHsNQl+djW/rgX9MWNxtpATgxE24xmXGaU0ShCC NX+aF5iLSVWnFxInIyqxqWwb2jwmGCZmIbUIEIM+fjaTbG73cgqjnMvmftUL4eaO8LLJKc 4yFSQiYiggXOXtPwwdYtivKV/8AoWeAi61Z1IBeDbm25yVrcA6HIehdsRG0X++kp5myT/Z C9zL35fygKpw7mxt3G6nBFwZIm/Wln/vLQFrnoQMsW41yX8a7jjPhR9jspJAk3Co/9O23C SsCaCPu2fxeHN5pvlmG9wEooWP8Mtau+FwTVHS/ET4L7yvIqN5GaUeJEbZBB8g== 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 4dlsbG0X11z181q for ; Tue, 06 Jan 2026 13:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f60c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 13:34:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 42a3d3d49ca4 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 42a3d3d49ca42cd9cf7cffbd095f18ddb90202f3 Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 13:34:34 +0000 Message-Id: <695d0f6a.3f60c.767769a9@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=42a3d3d49ca42cd9cf7cffbd095f18ddb90202f3 commit 42a3d3d49ca42cd9cf7cffbd095f18ddb90202f3 Author: Olivier Certner AuthorDate: 2025-12-02 14:39:33 +0000 Commit: Olivier Certner CommitDate: 2026-01-06 13:33:26 +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 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