From owner-svn-src-stable-7@FreeBSD.ORG  Tue Nov 23 09:17:01 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E131E1065673;
	Tue, 23 Nov 2010 09:17:00 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDBBF8FC25;
	Tue, 23 Nov 2010 09:17:00 +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 oAN9H0Zp022757;
	Tue, 23 Nov 2010 09:17:00 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAN9H0l4022755;
	Tue, 23 Nov 2010 09:17:00 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201011230917.oAN9H0l4022755@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Tue, 23 Nov 2010 09:17:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215736 - stable/7/sys/dev/hwpmc
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Nov 2010 09:17:01 -0000

Author: fabient
Date: Tue Nov 23 09:17:00 2010
New Revision: 215736
URL: http://svn.freebsd.org/changeset/base/215736

Log:
  MFC 200669:
  Recognize Intel CPUs with Family 0x6, Models 0x1E and 0x1F.

Modified:
  stable/7/sys/dev/hwpmc/hwpmc_intel.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/hwpmc/hwpmc_intel.c
==============================================================================
--- stable/7/sys/dev/hwpmc/hwpmc_intel.c	Tue Nov 23 09:12:43 2010	(r215735)
+++ stable/7/sys/dev/hwpmc/hwpmc_intel.c	Tue Nov 23 09:17:00 2010	(r215736)
@@ -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 */
 		case 0x2E:
 			cputype = PMC_CPU_INTEL_COREI7;
 			nclasses = 5;