aboutsummaryrefslogtreecommitdiff
path: root/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-12-06 09:38:28 +0000
committerXin LI <delphij@FreeBSD.org>2014-12-06 09:38:28 +0000
commit54f76dcb4aba6e13af6d80f48b5ab96dc347666d (patch)
tree513fea9bc129e319fda0524ff43977ed2a2be9b3 /sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
parent6054c38913c1a5a8bd53b1754eee3dc8d1e9771b (diff)
parentca0bb972db757f24729134b04099368cc2565f60 (diff)
downloadsrc-54f76dcb4aba6e13af6d80f48b5ab96dc347666d.tar.gz
src-54f76dcb4aba6e13af6d80f48b5ab96dc347666d.zip
MFV r275535:
Unexpand ISP2() and MSEC2NSEC(). Illumos issue: 5255 uts shouldn't open-code ISP2 MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=275562
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index 0cd832e2180e..bc51989018cf 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -176,7 +176,7 @@ dtrace_optval_t dtrace_ustackframes_default = 20;
dtrace_optval_t dtrace_jstackframes_default = 50;
dtrace_optval_t dtrace_jstackstrsize_default = 512;
int dtrace_msgdsize_max = 128;
-hrtime_t dtrace_chill_max = 500 * (NANOSEC / MILLISEC); /* 500 ms */
+hrtime_t dtrace_chill_max = MSEC2NSEC(500); /* 500 ms */
hrtime_t dtrace_chill_interval = NANOSEC; /* 1000 ms */
int dtrace_devdepth_max = 32;
int dtrace_err_verbose;
@@ -13782,7 +13782,7 @@ dtrace_dof_slurp(dof_hdr_t *dof, dtrace_vstate_t *vstate, cred_t *cr,
if (!(sec->dofs_flags & DOF_SECF_LOAD))
continue; /* just ignore non-loadable sections */
- if (sec->dofs_align & (sec->dofs_align - 1)) {
+ if (!ISP2(sec->dofs_align)) {
dtrace_dof_error(dof, "bad section alignment");
return (-1);
}