From owner-svn-src-stable@FreeBSD.ORG  Sat Jun 23 17:46:42 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B176C1065673;
	Sat, 23 Jun 2012 17:46:42 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B86D8FC08;
	Sat, 23 Jun 2012 17:46:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5NHkga0055146;
	Sat, 23 Jun 2012 17:46:42 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5NHkgUm055144;
	Sat, 23 Jun 2012 17:46:42 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201206231746.q5NHkgUm055144@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sat, 23 Jun 2012 17:46:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237487 - stable/9/sys/dev/hwpmc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jun 2012 17:46:42 -0000

Author: davide
Date: Sat Jun 23 17:46:42 2012
New Revision: 237487
URL: http://svn.freebsd.org/changeset/base/237487

Log:
  MFC r237196:
  
  Disable hwpmc(4) support for Intel Xeon Sandy Bridge (Model 0x2D).
  Due to some differences in MSRs between Xeon Sandy Bridge and Core Sandy
  Bridge (Model 0x2A), wrmsr() may generate in a GP# fault exception and so a
  panic of the machine.
  
  Approved by:		gnn (mentor)

Modified:
  stable/9/sys/dev/hwpmc/hwpmc_intel.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_intel.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_intel.c	Sat Jun 23 17:42:37 2012	(r237486)
+++ stable/9/sys/dev/hwpmc/hwpmc_intel.c	Sat Jun 23 17:46:42 2012	(r237487)
@@ -143,7 +143,6 @@ pmc_intel_initialize(void)
 			nclasses = 5;
 			break;
 		case 0x2A:	/* Per Intel document 253669-039US 05/2011. */
-		case 0x2D:	/* Per Intel document 253669-041US 12/2011. */	
 			cputype = PMC_CPU_INTEL_SANDYBRIDGE;
 			nclasses = 5;
 			break;