From owner-svn-src-all@FreeBSD.ORG  Fri Dec 18 15:01:47 2009
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 031AC106566B;
	Fri, 18 Dec 2009 15:01:47 +0000 (UTC)
	(envelope-from jkoshy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E62EE8FC17;
	Fri, 18 Dec 2009 15:01:46 +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 nBIF1kYd095488;
	Fri, 18 Dec 2009 15:01:46 GMT (envelope-from jkoshy@svn.freebsd.org)
Received: (from jkoshy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBIF1kLC095486;
	Fri, 18 Dec 2009 15:01:46 GMT (envelope-from jkoshy@svn.freebsd.org)
Message-Id: <200912181501.nBIF1kLC095486@svn.freebsd.org>
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Fri, 18 Dec 2009 15:01:46 +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: r200669 - head/sys/dev/hwpmc
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: Fri, 18 Dec 2009 15:01:47 -0000

Author: jkoshy
Date: Fri Dec 18 15:01:46 2009
New Revision: 200669
URL: http://svn.freebsd.org/changeset/base/200669

Log:
  Recognize Intel CPUs with Family 0x6, Models 0x1E and 0x1F.
  
  Submitted by:	Marc Unangst <mju at panasas dot com>

Modified:
  head/sys/dev/hwpmc/hwpmc_intel.c

Modified: head/sys/dev/hwpmc/hwpmc_intel.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_intel.c	Fri Dec 18 14:41:30 2009	(r200668)
+++ head/sys/dev/hwpmc/hwpmc_intel.c	Fri Dec 18 15:01:46 2009	(r200669)
@@ -131,6 +131,8 @@ pmc_intel_initialize(void)
 			nclasses = 3;
 			break;
 		case 0x1A:
+		case 0x1E:	/* Per Intel document 253669-032 9/2009, pages A-2 and A-57 */
+		case 0x1F:	/* Per Intel document 253669-032 9/2009, pages A-2 and A-57 */
 			cputype = PMC_CPU_INTEL_COREI7;
 			nclasses = 3;
 			break;