diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-03-05 20:14:42 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-03-05 22:21:27 +0000 |
| commit | 97231876f92481697532dc999577f997624cfecd (patch) | |
| tree | e964e79a071c0cec843dd70a57bdda30268679bf /usr/src/uts/common/conf | |
| parent | df8e9ae2b126b7dc626ed694e6b79e0e941149e4 (diff) | |
| parent | 41610d101ac089e52e33b0a671581e0c80d256c0 (diff) | |
| download | illumos-joyent-97231876f92481697532dc999577f997624cfecd.tar.gz | |
Merge /root/git/illumos-gate
* /root/git/illumos-gate:
commit 41610d101ac089e52e33b0a671581e0c80d256c0
3530 ::smbsess prints wrong IP addresses in verbose mode, has no idea about IPv6
commit d04756377ddd1cf28ebcf652541094e17b03c889
3603 panic from bpobj_enqueue_subobj()
3604 zdb should print bpobjs more verbosely
commit df49e4e49391204d49b62e99bfae86101a20c690
3551 hvm_sd module missing dependencies on scsi and cmlb
commit 0689f76c08c5e553ff25ac43a852b56c430bb61e
3582 zfs_delay() should support a variable resolution
3584 DTrace sdt probes for ZFS txg states
Conflicts:
usr/src/uts/common/fs/zfs/dsl_dir.c
usr/src/uts/common/fs/zfs/dsl_pool.c
Diffstat (limited to 'usr/src/uts/common/conf')
| -rw-r--r-- | usr/src/uts/common/conf/param.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/conf/param.c b/usr/src/uts/common/conf/param.c index 06e7810f07..34e2d3324d 100644 --- a/usr/src/uts/common/conf/param.c +++ b/usr/src/uts/common/conf/param.c @@ -697,10 +697,10 @@ param_init(void) * should re-evaluate their usage and specify the appropriate * resolution. */ - time_res[TR_NANOSEC] = SEC; - time_res[TR_MICROSEC] = MILLISEC; - time_res[TR_MILLISEC] = MICROSEC; - time_res[TR_SEC] = NANOSEC; + time_res[TR_NANOSEC] = NANOSEC / NANOSEC; + time_res[TR_MICROSEC] = NANOSEC / MICROSEC; + time_res[TR_MILLISEC] = NANOSEC / MILLISEC; + time_res[TR_SEC] = NANOSEC / SEC; time_res[TR_CLOCK_TICK] = nsec_per_tick; } |