From owner-svn-src-all@FreeBSD.ORG  Thu Jan  3 18:50:28 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A529AC25;
 Thu,  3 Jan 2013 18:50:28 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7DA2AAD9;
 Thu,  3 Jan 2013 18:50:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r03IoSWb063694;
 Thu, 3 Jan 2013 18:50:28 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r03IoSBL063693;
 Thu, 3 Jan 2013 18:50:28 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201301031850.r03IoSBL063693@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Thu, 3 Jan 2013 18:50:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r244999 - stable/9/sys/dev/hwpmc
X-SVN-Group: stable-9
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.14
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: Thu, 03 Jan 2013 18:50:28 -0000

Author: gnn
Date: Thu Jan  3 18:50:27 2013
New Revision: 244999
URL: http://svnweb.freebsd.org/changeset/base/244999

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

Modified:
  stable/9/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/dev/puc/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_core.c	Thu Jan  3 16:15:35 2013	(r244998)
+++ stable/9/sys/dev/hwpmc/hwpmc_core.c	Thu Jan  3 18:50:27 2013	(r244999)
@@ -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 | \