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
| \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
