From owner-svn-src-all@FreeBSD.ORG  Tue Mar 15 17:14:27 2011
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 1FF4B106566B;
	Tue, 15 Mar 2011 17:14:27 +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 0D1FE8FC14;
	Tue, 15 Mar 2011 17:14:27 +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 p2FHEQP2049459;
	Tue, 15 Mar 2011 17:14:26 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2FHEQdF049456;
	Tue, 15 Mar 2011 17:14:26 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201103151714.p2FHEQdF049456@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 15 Mar 2011 17:14:26 +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: r219672 - in head: share/man/man9 sys/i386/include
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, 15 Mar 2011 17:14:27 -0000

Author: jkim
Date: Tue Mar 15 17:14:26 2011
New Revision: 219672
URL: http://svn.freebsd.org/changeset/base/219672

Log:
  Unconditionally use binuptime(9) for get_cyclecount(9) on i386.  Since this
  function is almost exclusively used for random harvesting, there is no need
  for micro-optimization.  Adjust the manual page accordingly.

Modified:
  head/share/man/man9/get_cyclecount.9
  head/sys/i386/include/cpu.h

Modified: head/share/man/man9/get_cyclecount.9
==============================================================================
--- head/share/man/man9/get_cyclecount.9	Tue Mar 15 16:50:17 2011	(r219671)
+++ head/share/man/man9/get_cyclecount.9	Tue Mar 15 17:14:26 2011	(r219672)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 24, 2009
+.Dd March 15, 2011
 .Dt GET_CYCLECOUNT 9
 .Os
 .Sh NAME
@@ -65,14 +65,14 @@ do not have such a register,
 so
 .Fn get_cyclecount
 on these platforms
-returns a (non-monotonic) combination of numbers
+returns a (monotonic) combination of numbers
 represented by the
 structure returned by
 .Xr binuptime 9 .
 .Pp
 The
-.Tn Pentium
-processors all use the
+.Tn AMD64 and Intel 64
+processors use the
 .Li TSC
 register.
 .Pp

Modified: head/sys/i386/include/cpu.h
==============================================================================
--- head/sys/i386/include/cpu.h	Tue Mar 15 16:50:17 2011	(r219671)
+++ head/sys/i386/include/cpu.h	Tue Mar 15 17:14:26 2011	(r219672)
@@ -70,15 +70,10 @@ void	swi_vm(void *);
 static __inline uint64_t
 get_cyclecount(void)
 {
-#if defined(I486_CPU) || defined(KLD_MODULE)
 	struct bintime bt;
 
-	if (!tsc_present) {
-		binuptime(&bt);
-		return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
-	}
-#endif
-	return (rdtsc());
+	binuptime(&bt);
+	return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
 }
 
 #endif