Index: etc/rc.d/devd
===================================================================
--- etc/rc.d/devd	(revision 265693)
+++ etc/rc.d/devd	(working copy)
@@ -30,9 +30,10 @@
 {
 	find_pidfile
 
-	# If devd is disabled, turn it off in the kernel to avoid memory leaks.
+	# If devd is disabled, turn it off in the kernel to avoid unnecessary
+	# memory usage.
 	if ! checkyesno ${rcvar}; then
-	    $SYSCTL hw.bus.devctl_disable=1
+	    $SYSCTL hw.bus.devctl_queue=0
 	fi
 }
 
Index: etc/rc.d
===================================================================
--- etc/rc.d	(revision 265693)
+++ etc/rc.d	(working copy)

Property changes on: etc/rc.d
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/etc/rc.d:r263758
Index: etc
===================================================================
--- etc	(revision 265693)
+++ etc	(working copy)

Property changes on: etc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/etc:r263758
Index: sbin/devd/devd.cc
===================================================================
--- sbin/devd/devd.cc	(revision 265693)
+++ sbin/devd/devd.cc	(working copy)
@@ -99,7 +99,7 @@
 
 #define PIPE "/var/run/devd.pipe"
 #define CF "/etc/devd.conf"
-#define SYSCTL "hw.bus.devctl_disable"
+#define SYSCTL "hw.bus.devctl_queue"
 
 /*
  * Since the client socket is nonblocking, we must increase its send buffer to
@@ -1119,9 +1119,9 @@
 	len = sizeof(val);
 	if (sysctlbyname(SYSCTL, &val, &len, NULL, 0) != 0)
 		errx(1, "devctl sysctl missing from kernel!");
-	if (val) {
-		warnx("Setting " SYSCTL " to 0");
-		val = 0;
+	if (val == 0) {
+		warnx("Setting " SYSCTL " to 1000");
+		val = 1000;
 		sysctlbyname(SYSCTL, NULL, NULL, &val, sizeof(val));
 	}
 }
Index: sbin/devd
===================================================================
--- sbin/devd	(revision 265693)
+++ sbin/devd	(working copy)

Property changes on: sbin/devd
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sbin/devd:r263758
Index: sbin
===================================================================
--- sbin	(revision 265693)
+++ sbin	(working copy)

Property changes on: sbin
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sbin:r263758
Index: share/man/man4/devctl.4
===================================================================
--- share/man/man4/devctl.4	(revision 265693)
+++ share/man/man4/devctl.4	(working copy)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 11, 2003
+.Dd March 26, 2014
 .Dt DEVCTL 4
 .Os
 .Sh NAME
@@ -73,9 +73,9 @@
 the rest of the data.
 Listening programs are expected to cope.
 .Pp
-The sysctl and boot parameter
-.Va hw.bus.devctl_disable
-is used to disable
+The sysctl
+.Va hw.bus.devctl_queue
+can be used to control queue length. It is set to 0 to disable
 .Nm
 when no
 .Xr devd 8
Index: share/man/man4
===================================================================
--- share/man/man4	(revision 265693)
+++ share/man/man4	(working copy)

Property changes on: share/man/man4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/share/man/man4:r263758
Index: share/man
===================================================================
--- share/man	(revision 265693)
+++ share/man	(working copy)

Property changes on: share/man
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/share/man:r263758
Index: share
===================================================================
--- share	(revision 265693)
+++ share	(working copy)

Property changes on: share
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/share:r263758
Index: tools/tools/sysdoc/tunables.mdoc
===================================================================
--- tools/tools/sysdoc/tunables.mdoc	(revision 265693)
+++ tools/tools/sysdoc/tunables.mdoc	(working copy)
@@ -233,16 +233,6 @@
 for more information.
 
 ---
-hw.bus.devctl_disable
-bool
-
-This can be used to turn off
-.Xr devctl 4
-when no
-.Xr devd 8 
-is running.
-
----
 hw.bus.devices
 
 ---
Index: tools/tools/sysdoc
===================================================================
--- tools/tools/sysdoc	(revision 265693)
+++ tools/tools/sysdoc	(working copy)

Property changes on: tools/tools/sysdoc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/tools/tools/sysdoc:r263758
Index: tools/tools
===================================================================
--- tools/tools	(revision 265693)
+++ tools/tools	(working copy)

Property changes on: tools/tools
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/tools/tools:r263758
Index: tools
===================================================================
--- tools	(revision 265693)
+++ tools	(working copy)

Property changes on: tools
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/tools:r263758
Index: .
===================================================================
--- .	(revision 265693)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head:r263758