svn commit: r215736 - stable/7/sys/dev/hwpmc

[Fabien Thomas]

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;