diff options
| author | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-13 01:32:32 -0800 |
|---|---|---|
| committer | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-13 01:32:32 -0800 |
| commit | d3d50737e566cade9a08d73d2af95105ac7cd960 (patch) | |
| tree | 399b76a3f6bf107e2ff506d8f9c3333654b29fc7 /usr/src/uts/sun/io/scsi/adapters/sf.c | |
| parent | 1eff5f7761619411b3c31280fcd96cefc32968b7 (diff) | |
| download | illumos-joyent-d3d50737e566cade9a08d73d2af95105ac7cd960.tar.gz | |
PSARC/2009/396 Tickless Kernel Architecture / lbolt decoupling
6860030 tickless clock requires a clock() decoupled lbolt / lbolt64
Portions contributed by Chad Mynhier <cmynhier@gmail.com>
Diffstat (limited to 'usr/src/uts/sun/io/scsi/adapters/sf.c')
| -rw-r--r-- | usr/src/uts/sun/io/scsi/adapters/sf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/uts/sun/io/scsi/adapters/sf.c b/usr/src/uts/sun/io/scsi/adapters/sf.c index bea7656096..70f758a01f 100644 --- a/usr/src/uts/sun/io/scsi/adapters/sf.c +++ b/usr/src/uts/sun/io/scsi/adapters/sf.c @@ -268,7 +268,7 @@ static int sf_reset_flag = 1; /* bool: to allow reset after LIP */ static int sf_abort_flag = 0; /* bool: to do just one abort */ #endif -extern volatile int64_t lbolt64; +extern int64_t ddi_get_lbolt64(void); /* * for converting between target number (switch) and hard address/AL_PA @@ -834,7 +834,7 @@ sf_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) */ (void) soc_force_lip(sf->sf_sochandle, sf->sf_socp, sf->sf_sochandle->fcal_portno, 0, FCAL_NO_LIP); - sf->sf_reset_time = lbolt64; + sf->sf_reset_time = ddi_get_lbolt64(); return (DDI_SUCCESS); default: @@ -1225,7 +1225,7 @@ sf_scsi_bus_config(dev_info_t *parent, uint_t flag, ASSERT(sf); reset_delay = (int64_t)(USEC_TO_TICK(SF_INIT_WAIT_TIMEOUT)) - - (lbolt64 - sf->sf_reset_time); + (ddi_get_lbolt64() - sf->sf_reset_time); if (reset_delay < 0) reset_delay = 0; @@ -6490,7 +6490,6 @@ sf_check_reset_delay(void *arg) uint_t lip_cnt, reset_timeout_flag = FALSE; clock_t lb; - lb = ddi_get_lbolt(); mutex_enter(&sf_global_mutex); |