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/common/io/ecpp.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/common/io/ecpp.c')
-rw-r--r-- | usr/src/uts/common/io/ecpp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/io/ecpp.c b/usr/src/uts/common/io/ecpp.c index d2aa9a05f1..c7c03826b5 100644 --- a/usr/src/uts/common/io/ecpp.c +++ b/usr/src/uts/common/io/ecpp.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -774,9 +774,9 @@ ecpp_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) * Wait if there's any activity on the port */ if ((pp->e_busy == ECPP_BUSY) || (pp->e_busy == ECPP_FLUSH)) { - (void) cv_timedwait(&pp->pport_cv, &pp->umutex, - ddi_get_lbolt() + - SUSPEND_TOUT * drv_usectohz(1000000)); + (void) cv_reltimedwait(&pp->pport_cv, &pp->umutex, + SUSPEND_TOUT * drv_usectohz(1000000), + TR_CLOCK_TICK); if ((pp->e_busy == ECPP_BUSY) || (pp->e_busy == ECPP_FLUSH)) { pp->suspended = FALSE; |