From owner-svn-src-all@FreeBSD.ORG  Tue Jul 17 14:36:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 752841065678;
	Tue, 17 Jul 2012 14:36:41 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F4B68FC17;
	Tue, 17 Jul 2012 14:36:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6HEafvM062837;
	Tue, 17 Jul 2012 14:36:41 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6HEafrp062834;
	Tue, 17 Jul 2012 14:36:41 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201207171436.q6HEafrp062834@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Tue, 17 Jul 2012 14:36:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238552 - in head/sys/cddl/dev/dtrace: amd64 i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jul 2012 14:36:41 -0000

Author: gnn
Date: Tue Jul 17 14:36:40 2012
New Revision: 238552
URL: http://svn.freebsd.org/changeset/base/238552

Log:
  Change UL to ULL since time is 32 bits.
  
  Pointed out by: avg@
  MFC after:	2 weeks

Modified:
  head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  head/sys/cddl/dev/dtrace/i386/dtrace_subr.c

Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
==============================================================================
--- head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c	Tue Jul 17 14:03:04 2012	(r238551)
+++ head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c	Tue Jul 17 14:36:40 2012	(r238552)
@@ -467,7 +467,7 @@ dtrace_gethrestime(void)
 
 	dtrace_getnanotime(&current_time);
 
-	return (current_time.tv_sec * 1000000000UL + current_time.tv_nsec);
+	return (current_time.tv_sec * 1000000000ULL + current_time.tv_nsec);
 }
 
 /* Function to handle DTrace traps during probes. See amd64/amd64/trap.c */

Modified: head/sys/cddl/dev/dtrace/i386/dtrace_subr.c
==============================================================================
--- head/sys/cddl/dev/dtrace/i386/dtrace_subr.c	Tue Jul 17 14:03:04 2012	(r238551)
+++ head/sys/cddl/dev/dtrace/i386/dtrace_subr.c	Tue Jul 17 14:36:40 2012	(r238552)
@@ -468,7 +468,7 @@ dtrace_gethrestime(void)
 
 	dtrace_getnanotime(&current_time);
 
-	return (current_time.tv_sec * 1000000000UL + current_time.tv_nsec);
+	return (current_time.tv_sec * 1000000000ULL + current_time.tv_nsec);
 }
 
 /* Function to handle DTrace traps during probes. See i386/i386/trap.c */