GENERIC_SMP/X86_64_GENERIC_SMP: Properly sync for the APIC_IO removal.

* X86_64_GENERIC_SMP was forgotten, too (hey, we do have grep :).

* Bring back the comments in GENERIC_SMP.

* Remove some CVS IDs and trailing whitespace in other configs.

diff --git a/sys/config/GENERIC b/sys/config/GENERIC
index a8f79dc..0899a56 100644 (file)
--- a/sys/config/GENERIC
+++ b/sys/config/GENERIC
@@ -3,8 +3,6 @@
 #
 # Check the LINT configuration file in sys/config, for an
 # exhaustive list of options.
-#
-# $DragonFly: src/sys/config/GENERIC,v 1.60 2008/07/26 14:26:30 sephe Exp $
 
 platform       pc32
 machine                i386
@@ -70,7 +68,7 @@ options         ALTQ_FAIRQ      #fair queueing
 # SMP boxes with severely broken BIOSes which
 # boot fine for non-SMP builds *might* work in SMP mode
 # if you disable APIC_IO by setting the loader tunable
-# hw.apic_io_enable to 0. 
+# hw.apic_io_enable to 0.
 #
 #options       SMP                     # Symmetric MultiProcessor Kernel
 

diff --git a/sys/config/GENERIC_SMP b/sys/config/GENERIC_SMP
index 5ad2561..e9eaf19 100644 (file)
--- a/sys/config/GENERIC_SMP
+++ b/sys/config/GENERIC_SMP
@@ -65,6 +65,11 @@ options         ALTQ_FAIRQ      #fair queueing
 #options        ALTQ_NOPCC      #don't use processor cycle counter
 #options        ALTQ_DEBUG      #for debugging
 
+# SMP boxes with severely broken BIOSes which
+# boot fine for non-SMP builds *might* work in SMP mode
+# if you disable APIC_IO by setting the loader tunable
+# hw.apic_io_enable to 0.
+#
 options        SMP                     # Symmetric MultiProcessor Kernel
 
 # Debugging for Development

diff --git a/sys/config/LINT b/sys/config/LINT
index 2656dfb..c7a2b86 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -126,7 +126,7 @@ options     ROOTDEVNAME=\"ufs:da0s2e\"
 # SMP boxes with severely broken BIOSes which
 # boot fine for non-SMP builds *might* work in SMP mode
 # if you disable APIC_IO by setting the loader tunable
-# hw.apic_io_enable to 0. 
+# hw.apic_io_enable to 0.
 #
 options        SMP                     # Symmetric MultiProcessor Kernel
 

diff --git a/sys/config/VKERNEL b/sys/config/VKERNEL
index ac67400..7f7f980 100644 (file)
--- a/sys/config/VKERNEL
+++ b/sys/config/VKERNEL
@@ -1,6 +1,4 @@
 # VKERNEL - configuration for a virtual kernel
-#
-# $DragonFly: src/sys/config/VKERNEL,v 1.14 2008/11/09 18:57:17 dillon Exp $
 
 platform       vkernel         # platform architecture (i386, vkernel, etc)
 machine                i386

diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64
index a4215bd..c5aeb76 100644 (file)
--- a/sys/config/VKERNEL64
+++ b/sys/config/VKERNEL64
@@ -1,6 +1,4 @@
 # VKERNEL - configuration for a virtual kernel
-#
-# $DragonFly: src/sys/config/VKERNEL,v 1.14 2008/11/09 18:57:17 dillon Exp $
 
 platform       vkernel64       # platform architecture (i386, vkernel, etc)
 machine                x86_64

diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index eee113e..b60dbb9 100644 (file)
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -63,7 +63,7 @@ options               ALTQ_FAIRQ      #fair queueing
 # SMP boxes with severely broken BIOSes which
 # boot fine for non-SMP builds *might* work in SMP mode
 # if you disable APIC_IO by setting the loader tunable
-# hw.apic_io_enable to 0. 
+# hw.apic_io_enable to 0.
 #
 #options       SMP                     # Symmetric MultiProcessor Kernel
 

diff --git a/sys/config/X86_64_GENERIC_SMP b/sys/config/X86_64_GENERIC_SMP
index 5393bc0..3189056 100644 (file)
--- a/sys/config/X86_64_GENERIC_SMP
+++ b/sys/config/X86_64_GENERIC_SMP
@@ -60,13 +60,12 @@ options             ALTQ_FAIRQ      #fair queueing
 #options       ALTQ_DEBUG      #for debugging
 
 
-# To make an SMP kernel both SMP and APIC_IO are usually
-# specified.  SMP boxes with severely broken BIOSes which
+# SMP boxes with severely broken BIOSes which
 # boot fine for non-SMP builds *might* work in SMP mode
-# if you define SMP and leave APIC_IO turned off.
+# if you disable APIC_IO by setting the loader tunable
+# hw.apic_io_enable to 0.
 #
 options        SMP                     # Symmetric MultiProcessor Kernel
-options        APIC_IO                 # Symmetric (APIC) I/O
 
 # Debugging for Development
 options        DDB