Author: kensmith
Date: Wed Oct 26 19:45:20 2011
New Revision: 226809
URL: http://svn.freebsd.org/changeset/base/226809

Log:
  MFC r226510,r226547:
  Comment out sbp(4) because it appears to cause boot failure on some
  systems.  Add comment explaining why sbp(4) is commented out.
  
  It was a mistake on my part to omit powerpc's GENERIC for r226510.
  But when I noticed the mistake I checked with the powerpc maintainer
  to see if I should correct the mistake Marcel said he'd prefer it be
  left as-is.
  
  Approved by:  re (kib)

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/i386/conf/GENERIC
  stable/9/sys/ia64/conf/GENERIC
  stable/9/sys/powerpc/conf/GENERIC
  stable/9/sys/sparc64/conf/GENERIC
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC     Wed Oct 26 19:07:36 2011        
(r226808)
+++ stable/9/sys/amd64/conf/GENERIC     Wed Oct 26 19:45:20 2011        
(r226809)
@@ -320,7 +320,8 @@ device              zyd             # ZyDAS zd1211/zd1211b 
wire
 
 # FireWire support
 device         firewire        # FireWire bus code
-device         sbp             # SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device                sbp             # SCSI over FireWire (Requires scbus 
and da)
 device         fwe             # Ethernet over FireWire (non-standard!)
 device         fwip            # IP over FireWire (RFC 2734,3146)
 device         dcons           # Dumb console driver

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC      Wed Oct 26 19:07:36 2011        
(r226808)
+++ stable/9/sys/i386/conf/GENERIC      Wed Oct 26 19:45:20 2011        
(r226809)
@@ -333,7 +333,8 @@ device              zyd             # ZyDAS zd1211/zd1211b 
wire
 
 # FireWire support
 device         firewire        # FireWire bus code
-device         sbp             # SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device                sbp             # SCSI over FireWire (Requires scbus 
and da)
 device         fwe             # Ethernet over FireWire (non-standard!)
 device         fwip            # IP over FireWire (RFC 2734,3146)
 device         dcons           # Dumb console driver

Modified: stable/9/sys/ia64/conf/GENERIC
==============================================================================
--- stable/9/sys/ia64/conf/GENERIC      Wed Oct 26 19:07:36 2011        
(r226808)
+++ stable/9/sys/ia64/conf/GENERIC      Wed Oct 26 19:45:20 2011        
(r226809)
@@ -166,7 +166,8 @@ device              uvscom          # USB serial support for
 
 # FireWire support
 device         fwip            # IP over FireWire (RFC 2734,3146)
-device         sbp             # SCSI over FireWire (need scbus & da)
+# sbp(4) works for some systems but causes boot failure on others
+#device                sbp             # SCSI over FireWire (need scbus & da)
 
 # Various (pseudo) devices
 device         ether           # Ethernet support

Modified: stable/9/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/9/sys/powerpc/conf/GENERIC   Wed Oct 26 19:07:36 2011        
(r226808)
+++ stable/9/sys/powerpc/conf/GENERIC   Wed Oct 26 19:45:20 2011        
(r226809)
@@ -161,6 +161,7 @@ device              kue             # Kawasaki LSI USB 
Ethernet
 
 # FireWire support
 device         firewire        # FireWire bus code
+# sbp(4) works for some systems but causes boot failure on others
 device         sbp             # SCSI over FireWire (Requires scbus and da)
 device         fwe             # Ethernet over FireWire (non-standard!)
 

Modified: stable/9/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/9/sys/sparc64/conf/GENERIC   Wed Oct 26 19:07:36 2011        
(r226808)
+++ stable/9/sys/sparc64/conf/GENERIC   Wed Oct 26 19:45:20 2011        
(r226809)
@@ -250,7 +250,8 @@ device              zyd             # ZyDAS zd1211/zd1211b 
wire
 
 # FireWire support
 device         firewire        # FireWire bus code
-device         sbp             # SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device                sbp             # SCSI over FireWire (Requires scbus 
and da)
 device         fwe             # Ethernet over FireWire (non-standard!)
 device         fwip            # IP over FireWire (RFC 2734,3146)
 device         dcons           # Dumb console driver
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to