From owner-p4-projects@FreeBSD.ORG  Sat Oct 20 22:54:21 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5F98F16A41A; Sat, 20 Oct 2007 22:54:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09AAF16A417
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 22:54:21 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9571413C442
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 22:54:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMsKZQ070111
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 22:54:20 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMsKo8070108
	for perforce@freebsd.org; Sat, 20 Oct 2007 22:54:20 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 20 Oct 2007 22:54:20 GMT
Message-Id: <200710202254.l9KMsKo8070108@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127857 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Oct 2007 22:54:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=127857

Change 127857 by jb@jb_freebsd8 on 2007/10/20 22:54:09

	No CLOCK_UPTIME in RELENG_6. RELENG_7 processes it the
	same as CLOCK_MONOTONIC.

Affected files ...

.. //depot/projects/dtrace6/src/sys/sys/time.h#3 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/sys/time.h#3 (text+ko) ====

@@ -331,7 +331,7 @@
 #ifndef _KERNEL
 static __inline hrtime_t gethrtime(void) {
 	struct timespec ts;
-	clock_gettime(CLOCK_UPTIME,&ts);
+	clock_gettime(CLOCK_MONOTONIC,&ts);
 	return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
 }
 #endif