svn commit: r234930 - head/sys/dev/hwpmc

[George V. Neville-Neil]

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 | \