diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-23 19:03:53 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-23 19:03:53 +0000 |
| commit | 6b3ed6f1b8fbda8338d005cbfe8ac62308064a86 (patch) | |
| tree | 42ec1113910508d53ffb2fc3c3d637971fc0a01b /usr/src/uts/common/dtrace/dtrace.c | |
| parent | 703e18fe4fdcab51c63e5f7cf2fff43735a6445d (diff) | |
| parent | 4cde9a1e4370decb0ae4451cc85ce57730965c8c (diff) | |
| download | illumos-joyent-6b3ed6f1b8fbda8338d005cbfe8ac62308064a86.tar.gz | |
[illumos-gate merge]
commit 4cde9a1e4370decb0ae4451cc85ce57730965c8c
4748 use an enum for tod_faulted global
commit 9aff5184bfbc5b708bf2ddd810ce726347b52332
4747 remove unused [DS]SIZE_LIMIT defines
commit 3b082ee621e893f087e4272c7e8b6d512d24e155
4746 remove EXPORT_SRC leftovers
commit 6907ca4bc759c5fd81b8a60fc5e1a1c7d1972e6a
4745 fix AVL code misspellings
commit a2afb611b30628fb74ad9eade4ae465f9031e262
3897 zfs filesystem and snapshot limits
commit 82d86f4e8b1400610e24f161032c16e049f173a0
4767 dtrace_probe() always has the timestamp
Conflicts:
usr/src/uts/common/fs/zfs/sys/dsl_dir.h
usr/src/uts/common/fs/zfs/dsl_dir.c
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/common/zfs/zfeature_common.c
Diffstat (limited to 'usr/src/uts/common/dtrace/dtrace.c')
| -rw-r--r-- | usr/src/uts/common/dtrace/dtrace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c index 941700cd5d..3ecd33e24e 100644 --- a/usr/src/uts/common/dtrace/dtrace.c +++ b/usr/src/uts/common/dtrace/dtrace.c @@ -22,7 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ /* @@ -6695,7 +6695,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, return; } - now = dtrace_gethrtime(); + now = mstate.dtms_timestamp = dtrace_gethrtime(); + mstate.dtms_present |= DTRACE_MSTATE_TIMESTAMP; vtime = dtrace_vtime_references != 0; if (vtime && curthread->t_dtrace_start) |