svn commit: r284138 - stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace

[Pedro F. Giffuni]

Author: pfg
Date: Sun Jun  7 21:14:48 2015
New Revision: 284138
URL: https://svnweb.freebsd.org/changeset/base/284138

Log:
  MFC r278167, MFV r266995:
  
  4767 dtrace_probe() always has the timestamp
  
  Reference:
  https://illumos.org/issues/4767
  
  Obtained from:	Illumos

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	Sun Jun  7 20:59:59 2015	(r284137)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	Sun Jun  7 21:14:48 2015	(r284138)
@@ -24,7 +24,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.
  */
 
 /*
@@ -7087,7 +7087,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)