diff options
author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-30 17:33:08 +0000 |
---|---|---|
committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-30 17:33:08 +0000 |
commit | e5eca69f4b721e7e2209d18b3358d79069be9024 (patch) | |
tree | 10281da4c59357b0ca0f9a89d716be080ed4c7ab /usr/src/uts/common/dtrace/dtrace.c | |
parent | e7a35eac19dab0d7a03157433255ec4d9ee9c60a (diff) | |
parent | 19449258028e6813f0b7a606b554b2fa37a390ec (diff) | |
download | illumos-joyent-e5eca69f4b721e7e2209d18b3358d79069be9024.tar.gz |
[illumos-gate merge]
commit 19449258028e6813f0b7a606b554b2fa37a390ec
4823 don't open-code NSEC2MSEC and MSEC2NSEC
commit cb3e7fb42f8104f779abb6856ccf6e5b8e6419d8
4819 fix mpt_sas command timeout handling
commit b59e2127f21675e88c58a4dd924bc55eeb83c7a6
4809 NANOSEC should be 'long long' to avoid integer overflow bugs
4810 spa_async_tasks_pending suffers from an integer overflow bug
4811 in.mpathd: tv2ns suffers from an integer overflow bug
Diffstat (limited to 'usr/src/uts/common/dtrace/dtrace.c')
-rw-r--r-- | usr/src/uts/common/dtrace/dtrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c index 3ecd33e24e..e52b51315c 100644 --- a/usr/src/uts/common/dtrace/dtrace.c +++ b/usr/src/uts/common/dtrace/dtrace.c @@ -139,7 +139,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; |