git: 56280cd297b7 - stable/15 - amd64: Revert an unintended change to GENERIC
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 22 Oct 2026 17:32:14 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=56280cd297b784cabaa224a20b98ad3b8780f546
commit 56280cd297b784cabaa224a20b98ad3b8780f546
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-09-29 23:11:53 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-10-22 15:45:41 +0000
amd64: Revert an unintended change to GENERIC
Fixes: 767cd9bb4200 ("vm_swapout: Fix the build without options RACCT")
(cherry picked from commit ec8b68ba8a4ad3b020805322f7c676869978a480)
---
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 106f171a93dc..e06c585318b6 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.