Changes to common header files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/x86_basic_defs.h b/open-vm-tools/lib/include/x86_basic_defs.h
index f9855cee1b01e4ace382104f5359770bf70cb850..3de6617d41860f20c56d2cf6ad3dfcd7f32fb719 100644 (file)
--- a/open-vm-tools/lib/include/x86_basic_defs.h
+++ b/open-vm-tools/lib/include/x86_basic_defs.h
@@ -89,6 +89,7 @@
 #define CR4_PCE        0x00000100
 #define CR4_OSFXSR     0x00000200 // CPU/OS supports SIMD insts
 #define CR4_OSXMMEXCPT 0x00000400 // #XF exception enable PIII only
+#define CR4_UMIP       0x00000800
 #define CR4_LA57       0x00001000
 #define CR4_VMXE       0x00002000
 #define CR4_SMXE       0x00004000
@@ -98,7 +99,7 @@
 #define CR4_SMEP       0x00100000
 #define CR4_SMAP       0x00200000
 #define CR4_PKE        0x00400000
-#define CR4_RESERVED   CONST64U(0xffffffffff889800)
+#define CR4_RESERVED   CONST64U(0xffffffffff889000)
 #define CR8_RESERVED   CONST64U(0xfffffffffffffff0)
 
 /*

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 60a1b23596ab53bdf9874de67e000ea407f11991..f091a31ad8d77616c013f2bf1ba74b746a6ce8a6 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -519,7 +519,7 @@ FLAG(   7,  0, EBX, 30,  1, AVX512BW,                          YES, 13, TRUE)  \
 FLAG(   7,  0, EBX, 31,  1, AVX512VL,                          YES, 13, TRUE)  \
 FLAG(   7,  0, ECX,  0,  1, PREFETCHWT1,                       YES, 13, TRUE)  \
 FLAG(   7,  0, ECX,  1,  1, AVX512VBMI,                        YES, 17, TRUE)  \
-FLAG(   7,  0, ECX,  2,  1, UMIP,                              NO,   0, FALSE) \
+FLAG(   7,  0, ECX,  2,  1, UMIP,                              YES, 17, FALSE) \
 FLAG(   7,  0, ECX,  3,  1, PKU,                               YES, 13, TRUE)  \
 FLAG(   7,  0, ECX,  4,  1, OSPKE,                             ANY, 13, TRUE)  \
 FLAG(   7,  0, ECX,  5,  1, WAITPKG,                           NO,   0, TRUE)  \