From owner-svn-src-all@FreeBSD.ORG  Sun Oct 12 10:40:00 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A9C5EE85;
 Sun, 12 Oct 2014 10:40:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 961C73F9;
 Sun, 12 Oct 2014 10:40:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9CAe0ht069975;
 Sun, 12 Oct 2014 10:40:00 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9CAe0hT069972;
 Sun, 12 Oct 2014 10:40:00 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201410121040.s9CAe0hT069972@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 12 Oct 2014 10:40:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r272981 - releng/10.1/sys/dev/hwpmc
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Sun, 12 Oct 2014 10:40:00 -0000

Author: bz
Date: Sun Oct 12 10:39:59 2014
New Revision: 272981
URL: https://svnweb.freebsd.org/changeset/base/272981

Log:
  MFS r272892 (r272713 in head):
  
   Since introducing the extra mapping in r250103 (head) for architectural performance
   events we have actually counted 'Branch Instruction Retired' when people
   asked for 'Unhalted core cycles' using the 'unhalted-core-cycles' event mask
   mnemonic.
  
   Reviewed by:		jimharris
   Discussed with:	gnn, rwatson
  Sponsored by:		DARPA/AFRL
  Approved by:		re (gjb)

Modified:
  releng/10.1/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- releng/10.1/sys/dev/hwpmc/hwpmc_core.c	Sun Oct 12 10:07:26 2014	(r272980)
+++ releng/10.1/sys/dev/hwpmc/hwpmc_core.c	Sun Oct 12 10:39:59 2014	(r272981)
@@ -1796,7 +1796,7 @@ iap_is_event_architectural(enum pmc_even
 	switch (pe) {
 	case PMC_EV_IAP_ARCH_UNH_COR_CYC:
 		ae = CORE_AE_UNHALTED_CORE_CYCLES;
-		*map = PMC_EV_IAP_EVENT_C4H_00H;
+		*map = PMC_EV_IAP_EVENT_3CH_00H;
 		break;
 	case PMC_EV_IAP_ARCH_INS_RET:
 		ae = CORE_AE_INSTRUCTION_RETIRED;