From nobody Tue Feb 27 10:42:24 2024 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 4TkYw114P4z5CvyQ; Tue, 27 Feb 2024 10:42:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYw06R7vz4vPc; Tue, 27 Feb 2024 10:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030544; 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=QSN8zSwT6l3WmYAQNfus/mkEqy3GDuLbvSMX2HmYv5U=; b=IA1cXx4lB8sNjramzzfO1qmcJhExQahRN2ezhB82FVNBFtawaz7JDMy6zFSE7HdnVOUWpq CMHGuErm5XLAov102Z3FOvsZX/pVpwO3C6RgCAWo0QXmPPLtlz2lAI5/P0Ftb3WX8N388F eNceblxW7VUh4qcRsi1v9YZkWxH9sl0caYiSK8bCjp1h98S9hf8SDtPuaYYQcElS7JPckg Ex4dVBr7Zq6EvKLgbyNNkSCKS2u00ZCZukJ5WEghTEPqfupGATNkefCxFQBkYtWWQk1sJW xdHECZWHhty0KRPM8I59JqYPG/ChogQ7Ej7ql8oBB4wLH2ThQB9YSlRGjK7Yig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030544; a=rsa-sha256; cv=none; b=bTsBfb+4xm/rjRaDw68OYtar06gT18LOucy6cHSVBlzeeAa/VIBy4wC12ebwdllMn5ZZXD z80IL2THP6M1XBZxY/mAT3OOgGrgTi8pSOrmxb3o8RenY+VZE/4vhn05kxOn7MxulLJnc0 Rai0OO/KQ9jeTV/DUtWvwnlbg1L/l7qnZAlHanLBgM/eKYBl0AXfRtFT2DVJFZ7fY7+8z0 haxLkPD0B8gM+1pgh5526OsiR4iRrHdgbGpwMo7JKA+qo810wuBQ0gAg3l+6Fe3oBhQTr5 vPMxrlZw833sZZorgK2AnYwkCsAb07xagjK8/z7F2dSdY74Sh95vAjSoUbV1Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030544; 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=QSN8zSwT6l3WmYAQNfus/mkEqy3GDuLbvSMX2HmYv5U=; b=x0z8PFDGo+t6vLDn7vErUDb6vcSYucvXWnZN+yh0ifQYHXjbyw/f0b1vTQTY/JtWiG86Dv AmEgvGu1hDdDpAPDJAvr4cgL27doUuStUvtOv4bq3f9TybKv68ahEydbfvJkyDUOh2EnJ3 QcB5om9m7M28BKGoL64158TSYtiX0T7c1H1d9GvY30piFaPYHK02xA2vzltxRq9BBFvBZ4 FfhFwS0Cr06l/BpExkQwYVee3HbQlB157yhY0eIlevlRFqbU+fQsJUtZWfZH15Bs7ZG2sO QzJJoe2k6276unURoWxBgKvAT1SCzHf1uXJU/shf5vdNp3f368S+3nNAlnxmYg== 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 4TkYw05Wl8z184M; Tue, 27 Feb 2024 10:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAgOmE079742; Tue, 27 Feb 2024 10:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAgOAM079739; Tue, 27 Feb 2024 10:42:24 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:42:24 GMT Message-Id: <202402271042.41RAgOAM079739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: fe5468bdf404 - stable/13 - kern_racct.c: Don't compile if RACCT undefined 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: fe5468bdf404160b05ad892e944161edbd00240c Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fe5468bdf404160b05ad892e944161edbd00240c commit fe5468bdf404160b05ad892e944161edbd00240c Author: Olivier Certner AuthorDate: 2023-11-21 17:33:08 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:41:54 +0000 kern_racct.c: Don't compile if RACCT undefined Just skip compiling this file if RACCT isn't defined. This allows to skip including headers that no code uses at all, and also to remove the whole file's #ifdef/#endif bracketing. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 7fa08d415283c9a0c1e2b57edfbb13d722c25735) Approved by: emaste (mentor) --- sys/conf/files | 2 +- sys/kern/kern_racct.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 5feae02ddd82..20495b57b7c0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3888,7 +3888,7 @@ kern/kern_priv.c standard kern/kern_proc.c standard kern/kern_procctl.c standard kern/kern_prot.c standard -kern/kern_racct.c standard +kern/kern_racct.c optional racct kern/kern_rangelock.c standard kern/kern_rctl.c standard kern/kern_resource.c standard diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 435036a63777..41f77f2bcd71 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -59,8 +59,6 @@ #include #endif -#ifdef RACCT - FEATURE(racct, "Resource Accounting"); /* @@ -1357,5 +1355,3 @@ racct_init(void) prison0.pr_prison_racct = prison_racct_find("0"); } SYSINIT(racct, SI_SUB_RACCT, SI_ORDER_FIRST, racct_init, NULL); - -#endif /* !RACCT */