svn commit: r267038 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Bryan Drewery]

Author: bdrewery
Date: Wed Jun  4 05:04:15 2014
New Revision: 267038
URL: http://svnweb.freebsd.org/changeset/base/267038

Log:
  - Naively fix build by partially reverting r267029 to still use
    gethrtime() when building libzpool.
  
  X-MFC-With:	267029

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Wed Jun  4 04:18:33 2014	(r267037)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Wed Jun  4 05:04:15 2014	(r267038)
@@ -953,7 +953,11 @@ spa_taskq_dispatch_ent(spa_t *spa, zio_t
 	if (tqs->stqs_count == 1) {
 		tq = tqs->stqs_taskq[0];
 	} else {
+#ifdef _KERNEL
 		tq = tqs->stqs_taskq[cpu_ticks() % tqs->stqs_count];
+#else
+		tq = tqs->stqs_taskq[gethrtime() % tqs->stqs_count];
+#endif
 	}
 
 	taskq_dispatch_ent(tq, func, arg, flags, ent);