From: Oliver Kurth Date: Wed, 29 Aug 2018 20:29:45 +0000 (-0700) Subject: Changes to common header files not applicable to open-vm-tools. X-Git-Tag: stable-11.0.0~432 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b2bbc77ed18ac1b61dd9055ec1c468da5ba49af;p=thirdparty%2Fopen-vm-tools.git 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 f9855cee1..3de6617d4 100644 --- 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 60a1b2359..f091a31ad 100644 --- 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) \