From nobody Tue Feb 27 10:38:33 2024 X-Original-To: dev-commits-src-branches@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 4TkYqZ1q2xz5CvfR; Tue, 27 Feb 2024 10:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYqZ0fhFz4t13; Tue, 27 Feb 2024 10:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030314; 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=/WrlDiYwuCePKgw8sVKMz/avkkTjkRjno+Zoow8Tn9M=; b=greSBs9BzCbaW8zNYSNSj2hiXwbQr6eWySYO5705spsoGyjq/HWHb27AOk2QPiWb9rLHsT 1zcXr5k7+yCudGqCp+lXc9/V0FFu2XUaz1iYoGKLzoBIBS3dJNjdJKRED/yCkkrOFqzoUI qXmaOnNL2y02iVAnhr6A1Pn40R2aRrTqjEiXIKV2GRiROWBsC5WTs994LGzQo7aSE9M7OG p+HWirKwr/tUEO3gQPk7omulxoAg9/XG8XCxTewK4NooBagbJmcEkYeswU5OmZ2wk01a7p sqChJPbOG5/RvB9zy1EDPi1ERmbu42lwCa7FlQ2wXPu7nI0pKAp2OGTkh9/TNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030314; a=rsa-sha256; cv=none; b=iuDLFtGGAFBfPBpxDd8lZC/xTPC3C9Bxz2VGdYCZHmFTIbdfsQn6fWbUcySlskQdGbXWMb AqtUHIKnzmR07GaMIdAHbip/sS8cp3rsKx/39CHda4yioCqfPs0swdSEE0g4vog+oV8PNJ 9ty5yO5TEZbI9F6HZB/9YNBUMegGkGG8QdHyEWtpDpZNKiKUb0rv4JjScK7G/JXM4eClDj rxWFQVOkqOzYGjx3EMUiG8cWFIhG5exHSWTpRnPNM8FVacUw5iebX8oqfhTHJzZHi1kMh+ 9IHc/kDgr5J5Nth6k7WOp959kfCj0jwovaXTAraO6BAkVrei8KpOFkpMuWUE/g== 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=1709030314; 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=/WrlDiYwuCePKgw8sVKMz/avkkTjkRjno+Zoow8Tn9M=; b=fZTDH9JJiHXiOaLG95l8clBsOcK2Ad2+KPBpu+wAwYZC0DFB6qnPmbrdL61LbVz5Yua9My gHz2Z9tSRoWCuBeUNopPgTW+NjG0T/vswnXJwtwHUDJTJ85qjzizhmuosH/WKKEw0RJCTM v0/MQxbMERqUJIJDyAuVObkPAQ++PqmY2xnKOtgP8rJbqPjc7daZcseuHSbzpeHS8S9Ue+ bWSmYiMkx/fAHZ2bIKYWzwD6XLY2U+msWF4iAmQUlaJX34gaDT9cyNCnzDmssvxDrLfnnx Z0lXfPVRrB6L1tvHlaAZLSiNMzVz5t9TlF83Z7+SQADOjpfoZpGjwXRBWDLhcw== 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 4TkYqY6sq4z17Zs; Tue, 27 Feb 2024 10:38:33 +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 41RAcXOU063992; Tue, 27 Feb 2024 10:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAcXdN063989; Tue, 27 Feb 2024 10:38:33 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:38:33 GMT Message-Id: <202402271038.41RAcXdN063989@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: f54344ec12c8 - stable/14 - kern_racct.c: Don't compile if RACCT undefined List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f54344ec12c85fc732f79b6b0f19f45e99cf3e05 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f54344ec12c85fc732f79b6b0f19f45e99cf3e05 commit f54344ec12c85fc732f79b6b0f19f45e99cf3e05 Author: Olivier Certner AuthorDate: 2023-11-21 17:33:08 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:37:33 +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 4d5585b0bb79..b6a85d6a86a2 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3793,7 +3793,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 37b77243fe0e..43c3da0c2320 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"); /* @@ -1364,5 +1362,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 */