svn commit: r266995 - vendor-sys/illumos/dist/uts/common/dtrace

[Mark Johnston]

Author: markj
Date: Tue Jun  3 01:58:22 2014
New Revision: 266995
URL: http://svnweb.freebsd.org/changeset/base/266995

Log:
  4767 dtrace_probe() always has the timestamp
  
  illumos/illumos-gate at 82d86f4e8b1400610e24f161032c16e049f173a0

Modified:
  vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c

Modified: vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c	Tue Jun  3 01:55:27 2014	(r266994)
+++ vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c	Tue Jun  3 01:58:22 2014	(r266995)
@@ -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.
  */
 
 /*
@@ -6682,7 +6682,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t a
 		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)