changeset 11011:c3f5c03363d6

6896160 Disabling driver via "-B disable-xxx=true" on grub boot line results in panic
author Jerry Gilliam <Jerry.Gilliam@Sun.COM>
date Mon, 09 Nov 2009 13:28:25 -0800
parents 594a15c2a6ad
children 302f818f6d54
files usr/src/uts/i86pc/os/ddi_impl.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/i86pc/os/ddi_impl.c	Mon Nov 09 12:55:24 2009 -0800
+++ b/usr/src/uts/i86pc/os/ddi_impl.c	Mon Nov 09 13:28:25 2009 -0800
@@ -195,9 +195,8 @@
 	 */
 #if !defined(SAS) && !defined(MPSAS)
 	/*
-	 * Check for disabled drivers and initialize root node.
+	 * Initialize root node.
 	 */
-	check_driver_disable();
 	i_ddi_init_root();
 
 	/* reprogram devices not set up by firmware (BIOS) */
@@ -2562,6 +2561,11 @@
 	/* not framebuffer should be enumerated, if present */
 	get_vga_properties();
 
+	/*
+	 * Check for administratively disabled drivers.
+	 */
+	check_driver_disable();
+
 #if !defined(__xpv)
 	if (!post_fastreboot)
 		startup_bios_disk();