From owner-svn-src-head@FreeBSD.ORG  Wed May  2 16:23:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 549F01065670;
	Wed,  2 May 2012 16:23:37 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EF3E8FC15;
	Wed,  2 May 2012 16:23:37 +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 q42GNbJV093084;
	Wed, 2 May 2012 16:23:37 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q42GNbGe093082;
	Wed, 2 May 2012 16:23:37 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201205021623.q42GNbGe093082@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Wed, 2 May 2012 16:23:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234930 - head/sys/dev/hwpmc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 May 2012 16:23:37 -0000

Author: gnn
Date: Wed May  2 16:23:36 2012
New Revision: 234930
URL: http://svn.freebsd.org/changeset/base/234930

Log:
  Fix so that ,usr and ,os work correctly with fixed function (IAF)
  counters.
  
  MFC after:	1 week

Modified:
  head/sys/dev/hwpmc/hwpmc_core.c

Modified: head/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_core.c	Wed May  2 15:15:28 2012	(r234929)
+++ head/sys/dev/hwpmc/hwpmc_core.c	Wed May  2 16:23:36 2012	(r234930)
@@ -52,7 +52,8 @@ __FBSDID("$FreeBSD$");
 #define	CORE_CPUID_EDX			0x3
 
 #define	IAF_PMC_CAPS			\
-	(PMC_CAP_READ | PMC_CAP_WRITE | PMC_CAP_INTERRUPT)
+	(PMC_CAP_READ | PMC_CAP_WRITE | PMC_CAP_INTERRUPT | \
+	 PMC_CAP_USER | PMC_CAP_SYSTEM)
 #define	IAF_RI_TO_MSR(RI)		((RI) + (1 << 30))
 
 #define	IAP_PMC_CAPS (PMC_CAP_INTERRUPT | PMC_CAP_USER | PMC_CAP_SYSTEM | \