The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ec8b68ba8a4ad3b020805322f7c676869978a480
commit ec8b68ba8a4ad3b020805322f7c676869978a480 Author: Mark Johnston <[email protected]> AuthorDate: 2026-09-29 23:11:53 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2026-09-29 23:11:53 +0000 amd64: Revert an unintended change to GENERIC Fixes: 767cd9bb4200 ("vm_swapout: Fix the build without options RACCT") --- sys/amd64/conf/GENERIC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ed0b854d1766..61533394a3d0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -89,9 +89,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 -#ptions RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default -#options RCTL # Resource limits +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.
