From owner-svn-src-head@FreeBSD.ORG  Mon Mar 14 23:30:14 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C310A106564A;
	Mon, 14 Mar 2011 23:30:14 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B2B4B8FC0A;
	Mon, 14 Mar 2011 23:30:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2ENUEZh014906;
	Mon, 14 Mar 2011 23:30:14 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2ENUEL8014903;
	Mon, 14 Mar 2011 23:30:14 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201103142330.p2ENUEL8014903@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 14 Mar 2011 23:30:14 +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: r219653 - in head/sys: arm/include i386/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Mar 2011 23:30:14 -0000

Author: jkim
Date: Mon Mar 14 23:30:14 2011
New Revision: 219653
URL: http://svn.freebsd.org/changeset/base/219653

Log:
  Make get_cyclecount(9) little bit more useful where binuptime(9) is used.

Modified:
  head/sys/arm/include/cpu.h
  head/sys/i386/include/cpu.h

Modified: head/sys/arm/include/cpu.h
==============================================================================
--- head/sys/arm/include/cpu.h	Mon Mar 14 23:19:04 2011	(r219652)
+++ head/sys/arm/include/cpu.h	Mon Mar 14 23:30:14 2011	(r219653)
@@ -16,7 +16,7 @@ get_cyclecount(void)
 	struct bintime bt;
 
 	binuptime(&bt);
-	return (bt.frac ^ bt.sec);
+	return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
 			
 }
 #endif

Modified: head/sys/i386/include/cpu.h
==============================================================================
--- head/sys/i386/include/cpu.h	Mon Mar 14 23:19:04 2011	(r219652)
+++ head/sys/i386/include/cpu.h	Mon Mar 14 23:30:14 2011	(r219653)
@@ -67,7 +67,7 @@ void	swi_vm(void *);
  * Return contents of in-cpu fast counter as a sort of "bogo-time"
  * for random-harvesting purposes.
  */
-static __inline u_int64_t
+static __inline uint64_t
 get_cyclecount(void)
 {
 #if defined(I486_CPU) || defined(KLD_MODULE)
@@ -75,7 +75,7 @@ get_cyclecount(void)
 
 	if (!tsc_present) {
 		binuptime(&bt);
-		return (bt.frac ^ bt.sec);
+		return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
 	}
 #endif
 	return (rdtsc());