Index: head/sys/cddl/compat/opensolaris/sys/kcondvar.h
===================================================================
--- head/sys/cddl/compat/opensolaris/sys/kcondvar.h
+++ head/sys/cddl/compat/opensolaris/sys/kcondvar.h
@@ -63,13 +63,8 @@
 cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res,
     int flag)
 {
-	sbintime_t sbt;
-	sbintime_t pr;
 
-	sbt = tim * SBT_1NS;
-	pr = res * SBT_1NS;
-
-	return (cv_timedwait_sbt(cvp, mp, sbt, pr, 0));
+	return (cv_timedwait_sbt(cvp, mp, nstosbt(tim), nstosbt(res), 0));
 }
 
 #endif	/* _KERNEL */
Index: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
===================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
@@ -806,8 +806,8 @@
 		continue;
 	mutex_exit(&curthread->t_delay_lock);
 #else
-	pause_sbt("dmu_tx_delay", wakeup * SBT_1NS,
-	    zfs_delay_resolution_ns * SBT_1NS, C_ABSOLUTE);
+	pause_sbt("dmu_tx_delay", nstosbt(wakeup),
+	    nstosbt(zfs_delay_resolution_ns), C_ABSOLUTE);
 #endif
 #else
 	hrtime_t delta = wakeup - gethrtime();