git: a3b5daf4242f - stable/15 - sys: enable both SCHED_ULE and SCHED_4BSD for some configs

The branch stable/15 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=a3b5daf4242f993fb4e2d00979ce712bf1193706

commit a3b5daf4242f993fb4e2d00979ce712bf1193706
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-01-23 16:15:09 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-02-11 05:12:37 +0000

    sys: enable both SCHED_ULE and SCHED_4BSD for some configs
    
    (cherry picked from commit 1322760fd1274930cbb61048d9a6ba3bc1782b2a)
---
 sys/amd64/conf/GENERIC | 1 +
 sys/conf/NOTES         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 9fd35c9569f7..e4ed9704a65b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -24,6 +24,7 @@ makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 options 	SCHED_ULE		# ULE scheduler
+options 	SCHED_4BSD		# Original 4.xBSD scheduler
 options 	NUMA			# Non-Uniform Memory Architecture support
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	EXTERR_STRINGS
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 46787d2e690a..714f88ff2b80 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -210,7 +210,7 @@ options 	ROOTDEVNAME=\"ufs:da0s2e\"
 #
 options 	SCHED_4BSD
 options 	SCHED_STATS
-#options 	SCHED_ULE
+options 	SCHED_ULE
 
 #####################################################################
 # SMP OPTIONS: