From owner-svn-src-stable@FreeBSD.ORG  Tue Jan  3 16:54:48 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 68E6E106564A;
	Tue,  3 Jan 2012 16:54:48 +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 56FB68FC17;
	Tue,  3 Jan 2012 16:54:48 +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 q03GsmBo032704;
	Tue, 3 Jan 2012 16:54:48 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03Gsmbn032702;
	Tue, 3 Jan 2012 16:54:48 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201201031654.q03Gsmbn032702@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Tue, 3 Jan 2012 16:54:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229394 - stable/8/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: Tue, 03 Jan 2012 16:54:48 -0000

Author: fabient
Date: Tue Jan  3 16:54:47 2012
New Revision: 229394
URL: http://svn.freebsd.org/changeset/base/229394

Log:
  MFC r228198:
  Update Westmere uncore event exception list.

Modified:
  stable/8/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/8/sys/dev/hwpmc/hwpmc_core.c	Tue Jan  3 16:41:38 2012	(r229393)
+++ stable/8/sys/dev/hwpmc/hwpmc_core.c	Tue Jan  3 16:54:47 2012	(r229394)
@@ -1479,6 +1479,10 @@ iap_event_westmere_ok_on_counter(enum pm
 		/*
 		 * Events valid only on counter 0.
 		 */
+	case PMC_EV_IAP_EVENT_60H_01H:
+	case PMC_EV_IAP_EVENT_60H_02H:
+	case PMC_EV_IAP_EVENT_60H_04H:
+	case PMC_EV_IAP_EVENT_60H_08H:	
 	case PMC_EV_IAP_EVENT_B3H_01H:
 	case PMC_EV_IAP_EVENT_B3H_02H:
 	case PMC_EV_IAP_EVENT_B3H_04H:
@@ -1488,6 +1492,10 @@ iap_event_westmere_ok_on_counter(enum pm
 		/*
 		 * Events valid only on counter 0, 1.
 		 */
+	case PMC_EV_IAP_EVENT_4CH_01H:
+	case PMC_EV_IAP_EVENT_4EH_01H:
+	case PMC_EV_IAP_EVENT_4EH_02H:
+	case PMC_EV_IAP_EVENT_4EH_04H:
 	case PMC_EV_IAP_EVENT_51H_01H:
 	case PMC_EV_IAP_EVENT_51H_02H:
 	case PMC_EV_IAP_EVENT_51H_04H: