From owner-svn-src-head@FreeBSD.ORG  Tue Mar 15 21:45:10 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 5D2CC106566B;
	Tue, 15 Mar 2011 21:45:10 +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 4C4BC8FC14;
	Tue, 15 Mar 2011 21:45:10 +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 p2FLjAWB060258;
	Tue, 15 Mar 2011 21:45:10 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2FLjAlt060256;
	Tue, 15 Mar 2011 21:45:10 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201103152145.p2FLjAlt060256@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 15 Mar 2011 21:45:10 +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: r219679 - head/sys/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: Tue, 15 Mar 2011 21:45:10 -0000

Author: jkim
Date: Tue Mar 15 21:45:10 2011
New Revision: 219679
URL: http://svn.freebsd.org/changeset/base/219679

Log:
  Partially revert r219672.  After r198295, kernel need to seed randomness as
  soon as possible for stack protector.  However, dummy timecounter does not
  have enough entropy and we don't need to sacrifice Pentium class and later.
  
  Pointed out by:	Maxim Dounin (mdounin at mdounin dot ru)

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

Modified: head/sys/i386/include/cpu.h
==============================================================================
--- head/sys/i386/include/cpu.h	Tue Mar 15 21:34:10 2011	(r219678)
+++ head/sys/i386/include/cpu.h	Tue Mar 15 21:45:10 2011	(r219679)
@@ -69,10 +69,14 @@ void	swi_vm(void *);
 static __inline uint64_t
 get_cyclecount(void)
 {
+#if defined(I486_CPU) || defined(KLD_MODULE)
 	struct bintime bt;
 
 	binuptime(&bt);
 	return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
+#else
+	return (rdtsc());
+#endif
 }
 
 #endif