From nobody Wed Nov 22 19:18:02 2023 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 4Sb9xl48FQz51ZFr; Wed, 22 Nov 2023 19:18:03 +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 4Sb9xl13Q6z4GlS; Wed, 22 Nov 2023 19:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700680683; 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=C4sEnQi41a1/wyYm7GAfs2KCT+KviXC+lvi+hPMbFDk=; b=MFzM+RUGgQ6CpJQvLfxLoH5OzIgln4ZxMD7GL+7OAsX13QxhHs5skDAh8bQqXOQbmpTWFd 8dWlUYzibSrVrSHHrSVWEMbOPWWWffXiCmd7UjoiPQVQbo5nlHOtjXH+pCbbNTSlHA+aTn rB5wRAuTdKr6OxAbjm9J/X06ObWfpnPuwMts/xtkd9FDJ6EkHw8d4PFVVKU88TNEJRNutZ +/5qYPTvEwjQE1/q3TXdHowLCBj/YiPR6jEmKT3JBHFZ94lo9I+QYeZ2BILFTxyV8FP7Qt So6w0JeZSgsAOp7zFS1iJfk0O22d1nVxKjxcxFPKfcn1M6GHot8nDL4Du/YESQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700680683; 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=C4sEnQi41a1/wyYm7GAfs2KCT+KviXC+lvi+hPMbFDk=; b=bTKXlntFw9cEFDi5qRuDbT0FZg+gPm1RorprcHmpZG25REPCbGQBAwVGn+AjgcK0PiOHs/ bIPgqsdij7ul0bBXJvoA4Pvqz/cn1lFn8MdOrpQBS0rILz0XU9fAARAZQaOsE36PHUktwE sksnh029W2ytrJ3X02cbAcJUUcZSwfkECtn9G7SpxUjzD8mKoMKAaosHww3tff58VCI5eF epAV5vl9bWcI1fSetznBmpmolGf1VdLWoeuKAK5gBespc5jIGDNjrWgnKPM2oXO9uRke6p C0ovX1F4APV50o8GiFTzq8iVTrpW+KPLppVmezzOr9cszfjs4p1MoyaFjdld4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700680683; a=rsa-sha256; cv=none; b=xV/jWa/tfsqpQN7ikc0m6ZqTVQiJ52Tifi6Yv0iBalEOyGgEJS20Vg0muSPNf4M/Dht4st pyo6mO4Z79bflvHeaLtOsGlktRWHbNtIFpZvMPsqVnITWP+V+zIlvQCh4bI9bhZgbhNHLG 7hOl4v+lIVmrfcIlTE2NN1s0Gey8/wsatwk//YzDI2TmQDPd+me8btfMynmIG+k2hup0jK VxpuYKGble9y8SazPwLJojgukOFJvHPP/oF3/imBjKT+JARPF49WuvZgNuOawuar8zPe7K Dj6ugD4ss/i9+bKMVpGCOOhsZ+8+5G3OfzjSV/mO0Jvao2F7h6s+T/J2BZqGvw== 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 4Sb9xl08YZzXBB; Wed, 22 Nov 2023 19:18:03 +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 3AMJI2n7020216; Wed, 22 Nov 2023 19:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMJI2gX020213; Wed, 22 Nov 2023 19:18:02 GMT (envelope-from git) Date: Wed, 22 Nov 2023 19:18:02 GMT Message-Id: <202311221918.3AMJI2gX020213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7fa08d415283 - main - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fa08d415283c9a0c1e2b57edfbb13d722c25735 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7fa08d415283c9a0c1e2b57edfbb13d722c25735 commit 7fa08d415283c9a0c1e2b57edfbb13d722c25735 Author: Olivier Certner AuthorDate: 2023-11-21 17:33:08 +0000 Commit: Ed Maste CommitDate: 2023-11-22 19:17:17 +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 --- 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 c5cd70415931..7ffcbe6e0dda 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3795,7 +3795,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 */