summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2015-06-21 06:28:26 +0000
committertrasz <trasz@FreeBSD.org>2015-06-21 06:28:26 +0000
commite1055c772b450db60c53109ac296de1c9322438d (patch)
treec4fe9dc7d6f9ae04616fa06a004cd2d251b922b7 /sys/amd64
parent964ee5e924b5e0ab8fa3866fa26b2c4f8642d656 (diff)
downloadFreeBSD-src-e1055c772b450db60c53109ac296de1c9322438d.zip
FreeBSD-src-e1055c772b450db60c53109ac296de1c9322438d.tar.gz
MFC r282213:
Add kern.racct.enable tunable and RACCT_DISABLED config option. The point of this is to be able to add RACCT (with RACCT_DISABLED) to GENERIC, to avoid having to rebuild the kernel to use rctl(8). MFC r282901: Build GENERIC with RACCT/RCTL support by default. Note that it still needs to be enabled by adding "kern.racct.enable=1" to /boot/loader.conf. Note those two are MFC-ed together, because the latter one changes the name of RACCT_DISABLED option to RACCT_DEFAULT_TO_DISABLED. Should have committed the renaming separately... Relnotes: yes Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 5c217e9..4191bd1 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -72,6 +72,9 @@ options KDTRACE_FRAME # Ensure frames are compiled in
options KDTRACE_HOOKS # Kernel DTrace hooks
options DDB_CTF # Kernel ELF linker loads CTF data
options INCLUDE_CONFIG_FILE # Include this file in kernel
+options RACCT # Resource accounting framework
+options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
+options RCTL # Resource limits
# Debugging support. Always need this:
options KDB # Enable kernel debugger support.
OpenPOWER on IntegriCloud