diff options
| author | Jerry Gilliam <Jerry.Gilliam@Sun.COM> | 2009-11-09 13:28:25 -0800 |
|---|---|---|
| committer | Jerry Gilliam <Jerry.Gilliam@Sun.COM> | 2009-11-09 13:28:25 -0800 |
| commit | 288e29327ca3984072a7c23213c22a6f4b3485bd (patch) | |
| tree | 991475d4dbf1cbd53a1a8885d6f528066b3403fe /usr | |
| parent | 80ba55855aa63819ae7c0d4f91482199f613ce6b (diff) | |
| download | illumos-gate-288e29327ca3984072a7c23213c22a6f4b3485bd.tar.gz | |
6896160 Disabling driver via "-B disable-xxx=true" on grub boot line results in panic
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/i86pc/os/ddi_impl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/uts/i86pc/os/ddi_impl.c b/usr/src/uts/i86pc/os/ddi_impl.c index 8580ea43eb..fafd476529 100644 --- a/usr/src/uts/i86pc/os/ddi_impl.c +++ b/usr/src/uts/i86pc/os/ddi_impl.c @@ -195,9 +195,8 @@ FP hardware exhibits Pentium floating point divide problem\n"); */ #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 @@ impl_setup_ddi(void) /* 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(); |