Author: rpaulo
Date: Thu Apr 18 07:09:27 2013
New Revision: 249608
URL: http://svnweb.freebsd.org/changeset/base/249608

Log:
  Move the previously added CPUID7 macros to CPUID_STDEXT.

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

Modified: head/sys/x86/include/specialreg.h
==============================================================================
--- head/sys/x86/include/specialreg.h   Thu Apr 18 05:58:07 2013        
(r249607)
+++ head/sys/x86/include/specialreg.h   Thu Apr 18 07:09:27 2013        
(r249608)
@@ -172,23 +172,6 @@
 #define        CPUTPM2_EFFREQ  0x00000001
 
 /*
- * Structured Extended Features
- */
-#define        CPUID7_GSFSBASE 0x00000001
-#define        CPUID7_TSCADJ   0x00000002
-#define        CPUID7_BMI1     0x00000008
-#define        CPUID7_HLE      0x00000010
-#define        CPUID7_AVX2     0x00000020
-#define        CPUID7_SMEP     0x00000080
-#define        CPUID7_BMI2     0x00000100
-#define        CPUID7_ENHMOVSB 0x00000200
-#define        CPUID7_INVPCID  0x00000400
-#define        CPUID7_RTM      0x00000800
-#define        CPUID7_RDSEED   0x00040000
-#define        CPUID7_ADX      0x00080000
-#define        CPUID7_SMAP     0x00100000
-
-/*
  * Important bits in the AMD extended cpuid flags
  */
 #define        AMDID_SYSCALL   0x00000800
@@ -295,11 +278,22 @@
 #define        AMDID_COREID_SIZE       0x0000f000
 #define        AMDID_COREID_SIZE_SHIFT 12
 
+/*
+ * Structured Extended Features
+ */
 #define        CPUID_STDEXT_FSGSBASE   0x00000001
 #define        CPUID_STDEXT_TSC_ADJUST 0x00000002
+#define        CPUID_STDEXT_BMI1       0x00000008
+#define        CPUID_STDEXT_HLE        0x00000010
+#define        CPUID_STDEXT_AVX2       0x00000020
 #define        CPUID_STDEXT_SMEP       0x00000080
+#define        CPUID_STDEXT_BMI2       0x00000100
 #define        CPUID_STDEXT_ENH_MOVSB  0x00000200
+#define        CPUID_STDEXT_RTM        0x00000800
 #define        CPUID_STDEXT_INVPCID    0x00000400
+#define        CPUID_STDEXT_RDSEED     0x00040000
+#define        CPUID_STDEXT_ADX        0x00080000
+#define        CPUID_STDEXT_SMAP       0x00100000
 
 /*
  * CPUID manufacturers identifiers
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to