summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/os/instance.c
diff options
context:
space:
mode:
authorChris Horne <Chris.Horne@Sun.COM>2010-05-13 12:39:32 -0600
committerChris Horne <Chris.Horne@Sun.COM>2010-05-13 12:39:32 -0600
commit1b94a41b6ff7cb545cabcda970647c0361ed118a (patch)
tree244fb2a4de2c075005f276eb96390aecc34f5cd0 /usr/src/uts/common/os/instance.c
parent9d8d9e1151895fac86a2e3216647dd2a020ecf71 (diff)
downloadillumos-joyent-1b94a41b6ff7cb545cabcda970647c0361ed118a.tar.gz
6946938 SCSAv3: sometimes phymaps observations fail to activate
6950461 SCSAv3: should be able to modunload the pmcs driver 6951142 scsi_ifsetcap should always update dma_attr_granular when tran_setup_pkt is defined 6951267 fix for 6948076 can still double-allocate a preassigned instance number 6951616 sunmdi.c should avoid unnecessary use of ct_dip
Diffstat (limited to 'usr/src/uts/common/os/instance.c')
-rw-r--r--usr/src/uts/common/os/instance.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/src/uts/common/os/instance.c b/usr/src/uts/common/os/instance.c
index 05dbe09f14..1079db3e25 100644
--- a/usr/src/uts/common/os/instance.c
+++ b/usr/src/uts/common/os/instance.c
@@ -747,6 +747,12 @@ in_next_instance_block(major_t major, int block_size)
prev = dp->ind_instance;
}
+ /* Don't return anything in the preassign area. */
+ if (prev < dnp->dn_pinstance) {
+ prev = dnp->dn_pinstance - 1;
+ hole++; /* preassign hole */
+ }
+
/*
* If hole is zero then all holes are patched and we can resume
* quick allocations.