From owner-svn-src-head@FreeBSD.ORG  Tue Oct  2 03:33:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 85F6E106566B;
	Tue,  2 Oct 2012 03:33:42 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 70F318FC0A;
	Tue,  2 Oct 2012 03:33:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q923XgZ3060706;
	Tue, 2 Oct 2012 03:33:42 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q923Xg4I060704;
	Tue, 2 Oct 2012 03:33:42 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210020333.q923Xg4I060704@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 2 Oct 2012 03:33:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241119 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2012 03:33:42 -0000

Author: eadler
Date: Tue Oct  2 03:33:41 2012
New Revision: 241119
URL: http://svn.freebsd.org/changeset/base/241119

Log:
  Provide a generic way to disable devices at boot time
  
  PR:		kern/119202
  Requested by:	peterj
  Reviewed by:	sbruno, jhb
  Approved by:	cperciva
  MFC after:	1 week

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Tue Oct  2 00:30:26 2012	(r241118)
+++ head/sys/kern/subr_bus.c	Tue Oct  2 03:33:41 2012	(r241119)
@@ -2762,6 +2762,13 @@ device_attach(device_t dev)
 {
 	int error;
 
+	if (resource_disabled(dev->driver->name, dev->unit)) {
+		device_disable(dev);
+		if (bootverbose)
+			 device_printf(dev, "disabled via hints entry\n");
+		return (ENXIO);
+	}
+
 	device_sysctl_init(dev);
 	if (!device_is_quiet(dev))
 		device_print_child(dev->parent, dev);