diff options
| author | Toomas Soome <tsoome@me.com> | 2016-08-17 15:11:48 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2017-08-17 16:34:36 -0400 |
| commit | fdbb9738bc3cf273d0d8898e2f45f1bb76adff81 (patch) | |
| tree | dac37f02fb89ef67a8046010877e1d72fb37047a /usr/src | |
| parent | 8f982633e2a3337f8fd33e7d2282967b05dac29c (diff) | |
| download | illumos-joyent-fdbb9738bc3cf273d0d8898e2f45f1bb76adff81.tar.gz | |
8442 uts: startup_bios_disk() should check for BIOS
8581 uts: startup_bios_disk() is testing for unused variable dobiosdev
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Robert Mustachci <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/os/biosdisk.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/os/ddi_impl.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/usr/src/uts/i86pc/os/biosdisk.c b/usr/src/uts/i86pc/os/biosdisk.c index 297fbcdfbc..14f25f96ac 100644 --- a/usr/src/uts/i86pc/os/biosdisk.c +++ b/usr/src/uts/i86pc/os/biosdisk.c @@ -61,7 +61,6 @@ int biosdebug = 0; #endif biosdev_data_t biosdev_info[BIOSDEV_NUM]; /* from 0x80 to 0x87 */ -int dobiosdev = 1; static int bios_check_extension_present(uchar_t); @@ -82,9 +81,6 @@ startup_bios_disk() dev_info_t *devi; int extensions; - if (dobiosdev == 0) - return; - for (drivenum = 0x80; drivenum < (0x80 + BIOSDEV_NUM); drivenum++) { if (!drive_present(drivenum)) diff --git a/usr/src/uts/i86pc/os/ddi_impl.c b/usr/src/uts/i86pc/os/ddi_impl.c index 50d1e174ff..4044c0d3cd 100644 --- a/usr/src/uts/i86pc/os/ddi_impl.c +++ b/usr/src/uts/i86pc/os/ddi_impl.c @@ -2569,7 +2569,7 @@ impl_setup_ddi(void) check_driver_disable(); #if !defined(__xpv) - if (!post_fastreboot) + if (!post_fastreboot && BOP_GETPROPLEN(bootops, "efi-systab") < 0) startup_bios_disk(); #endif /* do bus dependent probes. */ |