summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/conf/GENERIC9
-rw-r--r--sys/amd64/conf/GENERIC12
-rw-r--r--sys/amd64/conf/SMP9
-rw-r--r--sys/i386/conf/GENERIC11
-rw-r--r--sys/i386/conf/SMP12
-rw-r--r--sys/pc98/conf/GENERIC9
-rw-r--r--sys/sparc64/conf/GENERIC9
7 files changed, 21 insertions, 50 deletions
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index dab69dd..20c70dc 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -74,15 +74,6 @@ options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
options ADAPTIVE_GIANT # Giant mutex is adaptive.
-# Debugging for use in -current
-options KDB # Enable kernel debugger support.
-options DDB # Support DDB.
-options GDB # Support remote GDB.
-options INVARIANTS # Enable calls of extra sanity checking
-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS # Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-
# To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3a916b7..edd218c 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -64,18 +64,6 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
options ADAPTIVE_GIANT # Giant mutex is adaptive.
-# Debugging for use in -current
-options KDB # Enable kernel debugger support.
-options DDB # Support DDB.
-options GDB # Support remote GDB.
-options INVARIANTS # Enable calls of extra sanity checking
-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-options WITNESS # Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-
-# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
-
# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
device atpic # 8259A compatability
diff --git a/sys/amd64/conf/SMP b/sys/amd64/conf/SMP
new file mode 100644
index 0000000..e2c6c43
--- /dev/null
+++ b/sys/amd64/conf/SMP
@@ -0,0 +1,9 @@
+#
+# SMP -- Generic kernel configuration file for FreeBSD/amd64 SMP
+# Use this for multi-processor machines
+#
+# $FreeBSD$
+
+include GENERIC
+
+options SMP
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 5a7f8bb..de6c838 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -63,17 +63,6 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
options ADAPTIVE_GIANT # Giant mutex is adaptive.
-# Debugging for use in -current
-options KDB # Enable kernel debugger support.
-options DDB # Support DDB.
-options GDB # Support remote GDB.
-options INVARIANTS # Enable calls of extra sanity checking
-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-options WITNESS # Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-
-# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
device apic # I/O APIC
# Bus support. Do not remove isa, even if you have no isa slots
diff --git a/sys/i386/conf/SMP b/sys/i386/conf/SMP
new file mode 100644
index 0000000..1a40a55
--- /dev/null
+++ b/sys/i386/conf/SMP
@@ -0,0 +1,12 @@
+#
+# SMP -- Generic kernel configuration file for FreeBSD/i386 SMP
+# Use this for multi-processor machines
+#
+# $FreeBSD$
+
+include GENERIC
+
+ident SMP-GENERIC
+
+# To make an SMP kernel, the next line is needed
+options SMP # Symmetric MultiProcessor Kernel
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 7b0b5b0..9ba0296 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -62,15 +62,6 @@ options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-# Debugging for use in -current
-options KDB # Enable kernel debugger support.
-options DDB # Support DDB.
-options GDB # Support remote GDB.
-options INVARIANTS # Enable calls of extra sanity checking
-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-options WITNESS # Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-
# To make an SMP kernel, the next two lines are needed
#options SMP # Symmetric MultiProcessor Kernel
#device apic # I/O APIC
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 4acf4c7..40684d3 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -62,15 +62,6 @@ options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
options ADAPTIVE_GIANT # Giant mutex is adaptive.
-# Debugging for use in -current
-options KDB # Enable kernel debugger support.
-options DDB # Support DDB.
-options GDB # Support remote GDB.
-options INVARIANTS # Enable calls of extra sanity checking
-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-options WITNESS # Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-
# To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel
OpenPOWER on IntegriCloud