svn commit: r261321 - head/sys/x86/include

Tijl Coosemans tijl at FreeBSD.org
Fri Jan 31 14:29:34 UTC 2014


Author: tijl
Date: Fri Jan 31 14:29:34 2014
New Revision: 261321
URL: http://svnweb.freebsd.org/changeset/base/261321

Log:
  Rename the AMD MSR_PERFCTR[0-3] so the Pentium Pro MSR_PERFCTR[0-1]
  aren't redefined.
  
  Reported by:	"Trivedi, Nishank" <Nishank.Trivedi at netapp.com>
  Discussed with:	kib

Modified:
  head/sys/x86/include/specialreg.h

Modified: head/sys/x86/include/specialreg.h
==============================================================================
--- head/sys/x86/include/specialreg.h	Fri Jan 31 13:12:02 2014	(r261320)
+++ head/sys/x86/include/specialreg.h	Fri Jan 31 14:29:34 2014	(r261321)
@@ -720,12 +720,10 @@
 #define	MSR_PERFEVSEL1	0xc0010001
 #define	MSR_PERFEVSEL2	0xc0010002
 #define	MSR_PERFEVSEL3	0xc0010003
-#undef MSR_PERFCTR0
-#undef MSR_PERFCTR1
-#define	MSR_PERFCTR0	0xc0010004
-#define	MSR_PERFCTR1	0xc0010005
-#define	MSR_PERFCTR2	0xc0010006
-#define	MSR_PERFCTR3	0xc0010007
+#define	MSR_K7_PERFCTR0	0xc0010004
+#define	MSR_K7_PERFCTR1	0xc0010005
+#define	MSR_K7_PERFCTR2	0xc0010006
+#define	MSR_K7_PERFCTR3	0xc0010007
 #define	MSR_SYSCFG	0xc0010010
 #define	MSR_HWCR	0xc0010015
 #define	MSR_IORRBASE0	0xc0010016


More information about the svn-src-all mailing list