Disable sbt and ubt devices. The bluetooth code will sometimes sleep while

holding locks, this is not allowed, and nobody has stepped up to fix this,
so better not lure people into using bluetooth devices.

16 files changed, 39 insertions, 39 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 0f345eebf78..48eb1cdba03 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.218 2010/11/26 20:13:53 miod Exp $
+#	$OpenBSD: GENERIC,v 1.219 2011/02/17 20:14:28 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -132,7 +132,7 @@ uvideo* at uhub?
 video*  at uvideo?
 
 # Bluetooth controllers
-ubt*	at uhub?			# USB Bluetooth
+ubt*	at uhub? disable		# USB Bluetooth
 bthub*	at ubt?
 
 bthidev* at bthub?			# Bluetooth HID support
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index a6f9cc24c04..780e820a88d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.312 2011/01/08 11:56:30 damien Exp $
+#	$OpenBSD: GENERIC,v 1.313 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -263,9 +263,9 @@ sdmmc*	at sdhc?		# SD/MMC bus
 scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-sbt*	at sdmmc?		# SDIO Bluetooth
+sbt*	at sdmmc? disable	# SDIO Bluetooth
 bthub*	at sbt?
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 70cdabf0f98..f18620cbf9a 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.38 2011/01/08 11:56:30 damien Exp $ 
+# $OpenBSD: GENERIC,v 1.39 2011/02/17 20:14:30 miod Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -162,7 +162,7 @@ uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
 onewire* at uow?
 
 # Bluetooth controllers
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 
 bthidev* at bthub?		# Bluetooth HID support
diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK
index be62e850370..4167c21d8c9 100644
--- a/sys/arch/armish/conf/RAMDISK
+++ b/sys/arch/armish/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.16 2010/07/03 03:59:16 krw Exp $ 
+# $OpenBSD: RAMDISK,v 1.17 2011/02/17 20:14:30 miod Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -139,7 +139,7 @@ wi*	at uhub?		# WaveLAN IEEE 802.11DS
 #uyap*	at uhub?		# Y@P firmware loader
 #udsbr*	at uhub?		# D-Link DSB-R100 radio
 #radio*	at udsbr?		# USB radio
-#ubt*	at uhub?		# USB Bluetooth
+#ubt*	at uhub? disable	# USB Bluetooth
 ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500
 #udcf*	at uhub?		# Gude Expert mouseCLOCK
diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC
index 28853486b7d..50e071d7f3a 100644
--- a/sys/arch/beagle/conf/GENERIC
+++ b/sys/arch/beagle/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.4 2010/11/26 20:13:55 miod Exp $
+# $OpenBSD: GENERIC,v 1.5 2011/02/17 20:14:30 miod Exp $
 #
 # GENERIC machine description file
 #
@@ -144,7 +144,7 @@ uscanner*	at uhub? disable	# USB Scanners
 #uyap*		at uhub?		# Y@P firmware loader
 udsbr*		at uhub?		# D-Link DSB-R100 radio
 radio*		at udsbr?		# USB radio
-#ubt*		at uhub?		# USB Bluetooth
+#ubt*		at uhub? disable	# USB Bluetooth
 ugen*		at uhub?		# USB Generic driver
 
 ukphy*	at mii?				# "unknown" PHYs
@@ -169,7 +169,7 @@ sdmmc*	at ommmc?		# SD/MMC bus
 scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-#sbt*	at sdmmc?		# SDIO Bluetooth
+#sbt*	at sdmmc? disable	# SDIO Bluetooth
 
 # APM emulation
 #apm0		at pxaip?
diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK
index 602676e6129..09c381c2ba5 100644
--- a/sys/arch/beagle/conf/RAMDISK
+++ b/sys/arch/beagle/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.8 2010/07/03 03:59:16 krw Exp $
+# $OpenBSD: RAMDISK,v 1.9 2011/02/17 20:14:30 miod Exp $
 #
 # GENERIC machine description file
 #
@@ -149,7 +149,7 @@ ommmc0		at ahb? addr 0x4809c000 intr 83
 # #uyap*		at uhub?		# Y@P firmware loader
 # udsbr*		at uhub?		# D-Link DSB-R100 radio
 # radio*		at udsbr?		# USB radio
-# #ubt*		at uhub?		# USB Bluetooth
+# #ubt*		at uhub? disable	# USB Bluetooth
 # ugen*		at uhub?		# USB Generic driver
 # 
 # ukphy*	at mii?				# "unknown" PHYs
@@ -175,7 +175,7 @@ sdmmc*	at ommmc?		# SD/MMC bus
 scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-#sbt*	at sdmmc?		# SDIO Bluetooth
+#sbt*	at sdmmc? disable	# SDIO Bluetooth
 
 # APM emulation
 #apm0		at pxaip?
diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC
index 109080ac3d5..6a9bb0300b6 100644
--- a/sys/arch/gumstix/conf/GENERIC
+++ b/sys/arch/gumstix/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.10 2010/11/26 20:13:55 miod Exp $
+#	$OpenBSD: GENERIC,v 1.11 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -209,9 +209,9 @@ ukphy*	at mii?				# "unknown" PHYs
 #scsibus*	at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-#sbt*	at sdmmc?			# SDIO Bluetooth
+#sbt*	at sdmmc? disable		# SDIO Bluetooth
 #bthub*	at sbt?
-#ubt*	at uhub?			# USB Bluetooth
+#ubt*	at uhub? disable		# USB Bluetooth
 #bthub*	at ubt?
 
 #bthidev* at bthub?			# Bluetooth HID support
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 7920f1400a1..2e9a5f9f68e 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.141 2011/01/02 14:01:18 matthieu Exp $
+#	$OpenBSD: GENERIC,v 1.142 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -171,7 +171,7 @@ udl*	at uhub?		# DisplayLink USB displays
 wsdisplay* at udl?
 
 # Bluetooth controllers
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 
 bthidev* at bthub?		# Bluetooth HID support
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 7cb5c2e6a6a..a48f0353eeb 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $
+#	$OpenBSD: RAMDISK,v 1.91 2011/02/17 20:14:30 miod Exp $
 #
 # Diskless kernel config
 #
@@ -157,7 +157,7 @@ wi*	at uhub?		# WaveLAN IEEE 802.11DS
 #uyap*	at uhub?		# Y@P firmware loader
 #udsbr*	at uhub?		# D-Link DSB-R100 radio
 #radio*	at udsbr?		# USB radio
-#ubt*	at uhub?		# USB Bluetooth
+#ubt*	at uhub? disable	# USB Bluetooth
 #ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index ff886789f75..67c2caa6f34 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.708 2011/01/15 04:39:27 kevlo Exp $
+#	$OpenBSD: GENERIC,v 1.709 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -322,9 +322,9 @@ sdmmc*	at sdhc?		# SD/MMC bus
 scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-sbt*	at sdmmc?		# SDIO Bluetooth
+sbt*	at sdmmc? disable	# SDIO Bluetooth
 bthub*	at sbt?
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index f67170a5fb3..35c637c81fe 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.31 2011/01/08 11:56:30 damien Exp $
+# $OpenBSD: GENERIC,v 1.32 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -167,7 +167,7 @@ udl*		at uhub?
 wsdisplay*	at udl?
 
 # Bluetooth controllers
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 
 bthidev* at bthub?		# Bluetooth HID support
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 7fd8f71bce2..5cd8754f2a8 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.31 2011/01/08 11:56:30 damien Exp $
+#	$OpenBSD: GENERIC,v 1.32 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -176,7 +176,7 @@ udl*		at uhub?
 wsdisplay*	at udl?
 
 # Bluetooth controllers
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 
 bthidev*	at bthub?		# Bluetooth HID support
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index b5ff6e0d749..835f2d1fd4d 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.205 2011/01/08 11:56:30 damien Exp $g
+#	$OpenBSD: GENERIC,v 1.206 2011/02/17 20:14:30 miod Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -316,7 +316,7 @@ udl*		at uhub?
 wsdisplay*	at udl?
 
 # Bluetooth controllers
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 
 bthidev* at bthub?		# Bluetooth HID support
diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC
index 44e7a2825b0..78b2be16a0c 100644
--- a/sys/arch/palm/conf/GENERIC
+++ b/sys/arch/palm/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.9 2010/11/26 20:13:55 miod Exp $
+#	$OpenBSD: GENERIC,v 1.10 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -195,9 +195,9 @@ sdmmc*		at pxammc?		# SD/MMC bus
 scsibus*	at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-sbt*	at sdmmc?			# SDIO Bluetooth
+sbt*	at sdmmc? disable		# SDIO Bluetooth
 bthub*	at sbt?
-ubt*	at uhub?			# USB Bluetooth
+ubt*	at uhub? disable		# USB Bluetooth
 bthub*	at ubt?
 
 # USB Video
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 08caf1986f0..8521885827a 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.262 2011/01/08 11:56:30 damien Exp $
+#	$OpenBSD: GENERIC,v 1.263 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -252,7 +252,7 @@ uvideo* at uhub?
 video*  at uvideo?
 
 # Bluetooth controllers
-ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub? disable	# USB Bluetooth
 bthub*	at ubt?
 
 bthidev* at bthub?		# Bluetooth HID support
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 7845aeff9b5..d2f2227ffc6 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.81 2010/11/26 20:13:55 miod Exp $
+#	$OpenBSD: GENERIC,v 1.82 2011/02/17 20:14:30 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -210,9 +210,9 @@ sdmmc*		at pxammc?		# SD/MMC bus
 scsibus*	at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-sbt*	at sdmmc?			# SDIO Bluetooth
+sbt*	at sdmmc? disable		# SDIO Bluetooth
 bthub*	at sbt?
-ubt*	at uhub?			# USB Bluetooth
+ubt*	at uhub? disable		# USB Bluetooth
 bthub*	at ubt?
 
 # USB Video