From owner-svn-src-all@FreeBSD.ORG  Tue Nov 25 13:35:07 2008
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 EDD501065672;
	Tue, 25 Nov 2008 13:35:06 +0000 (UTC)
	(envelope-from takawata@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E07808FC08;
	Tue, 25 Nov 2008 13:35:06 +0000 (UTC)
	(envelope-from takawata@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPDZ6M8023856;
	Tue, 25 Nov 2008 13:35:06 GMT
	(envelope-from takawata@svn.freebsd.org)
Received: (from takawata@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAPDZ66r023855;
	Tue, 25 Nov 2008 13:35:06 GMT
	(envelope-from takawata@svn.freebsd.org)
Message-Id: <200811251335.mAPDZ66r023855@svn.freebsd.org>
From: Takanori Watanabe <takawata@FreeBSD.org>
Date: Tue, 25 Nov 2008 13:35:06 +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: r185295 - head/sys/i386/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, 25 Nov 2008 13:35:07 -0000

Author: takawata
Date: Tue Nov 25 13:35:06 2008
New Revision: 185295
URL: http://svn.freebsd.org/changeset/base/185295

Log:
  Core i7 supports invaliant TSC and the presense is presented on
  this CPUID information, according to recently updated AP485.

Modified:
  head/sys/i386/i386/identcpu.c

Modified: head/sys/i386/i386/identcpu.c
==============================================================================
--- head/sys/i386/i386/identcpu.c	Tue Nov 25 13:33:18 2008	(r185294)
+++ head/sys/i386/i386/identcpu.c	Tue Nov 25 13:35:06 2008	(r185295)
@@ -846,7 +846,8 @@ printcpuinfo(void)
 			 * mention the capability.
 			 */
 			if (!tsc_is_invariant &&
-			    (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
+			    ((strcmp(cpu_vendor, "AuthenticAMD") == 0 ||
+			      (strcmp(cpu_vendor, "GenuineIntel") == 0))&&
 			    ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
 			    I386_CPU_FAMILY(cpu_id) >= 0x10 ||
 			    cpu_id == 0x60fb2))) {