summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2004-09-07 22:37:43 +0000
committerscottl <scottl@FreeBSD.org>2004-09-07 22:37:43 +0000
commit061851f77666a84ad54cc996513d8876fabc2fef (patch)
treef037a574bfc638ce4eb328d60839768e926b22e2
parent403eb08c16f61f52e1b23012d2511d23ef799d51 (diff)
downloadFreeBSD-src-061851f77666a84ad54cc996513d8876fabc2fef.zip
FreeBSD-src-061851f77666a84ad54cc996513d8876fabc2fef.tar.gz
Switch the default scheduler to 4BSD to match what will go into RELENG_5 soon.
It can be switched back once 5.3 is tested and released. Also turn on PREEMPTION as many of the stability problems with it have been fixed. MT5: 3 days.
-rw-r--r--sys/alpha/conf/GENERIC4
-rw-r--r--sys/amd64/conf/GENERIC4
-rw-r--r--sys/i386/conf/GENERIC4
-rw-r--r--sys/pc98/conf/GENERIC4
-rw-r--r--sys/sparc64/conf/GENERIC4
5 files changed, 15 insertions, 5 deletions
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 53b0e3a..0890753 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -46,7 +46,9 @@ options DEC_1000A # AlphaServer 1000, 1000A, 800
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
-options SCHED_ULE #ULE scheduler
+#options SCHED_ULE #ULE scheduler
+options SCHED_4BSD #4BSD scheduler
+options PREEMPTION #Enable kernel thread preemption
options INET #InterNETworking
options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 95afbc3..75e1e56 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -27,7 +27,9 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options SCHED_ULE # ULE scheduler
+#options SCHED_ULE # ULE scheduler
+options SCHED_4BSD # 4BSD scheduler
+options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 9e9051c..111c94f 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -29,7 +29,9 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options SCHED_ULE # ULE scheduler
+#options SCHED_ULE # ULE scheduler
+#options SCHED_4BSD # 4BSD scheduler
+options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 7dac427..9d69d81 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -31,7 +31,9 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options PC98 # PC98
-options SCHED_ULE # ULE scheduler
+#options SCHED_ULE # ULE scheduler
+options SCHED_4BSD # 4BSD scheduler
+options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 51651c5..f2a3a46 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -32,7 +32,9 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
# Platforms supported
# At this time all platforms are supported, as-is.
-options SCHED_ULE # ULE scheduler
+#options SCHED_ULE # ULE scheduler
+options SCHED_4BSD # 4BSD scheduler
+options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
OpenPOWER on IntegriCloud