From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 20 Dec 2019 20:25:52 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee8c84e05c52cd383900206af1358e3daee8576;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 0a36ccc56..5afba4acb 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -2188,10 +2188,6 @@ CPUID_MODEL_IS_ZEN3(uint32 eax)
 #define CPUID_TYPE_OVERDRIVE   1
 #define CPUID_TYPE_SECONDARY   2
 
-#define CPUID_INTEL_ID4EAX_LEAF4_CACHE_TYPE_NULL      0
-#define CPUID_INTEL_ID4EAX_LEAF4_CACHE_TYPE_DATA      1
-#define CPUID_INTEL_ID4EAX_LEAF4_CACHE_TYPE_INST      2
-#define CPUID_INTEL_ID4EAX_LEAF4_CACHE_TYPE_UNIF      3
 #define CPUID_LEAF4_CACHE_TYPE_NULL      0
 #define CPUID_LEAF4_CACHE_TYPE_DATA      1
 #define CPUID_LEAF4_CACHE_TYPE_INST      2
@@ -2199,17 +2195,15 @@ CPUID_MODEL_IS_ZEN3(uint32 eax)
 #define CPUID_LEAF4_CACHE_INDEXING_DIRECT  0
 #define CPUID_LEAF4_CACHE_INDEXING_COMPLEX 1
 
-#define CPUID_INTEL_ID4EAX_LEAF4_CACHE_SELF_INIT      0x00000100
-#define CPUID_INTEL_ID4EAX_LEAF4_CACHE_FULLY_ASSOC    0x00000200
 #define CPUID_LEAF4_CACHE_SELF_INIT      0x00000100
 #define CPUID_LEAF4_CACHE_FULLY_ASSOC    0x00000200
 
-#define CPUID_INTEL_IDBECX_LEVEL_TYPE_INVALID   0
-#define CPUID_INTEL_IDBECX_LEVEL_TYPE_SMT       1
-#define CPUID_INTEL_IDBECX_LEVEL_TYPE_CORE      2
 #define CPUID_TOPOLOGY_LEVEL_TYPE_INVALID   0
 #define CPUID_TOPOLOGY_LEVEL_TYPE_SMT       1
 #define CPUID_TOPOLOGY_LEVEL_TYPE_CORE      2
+#define CPUID_TOPOLOGY_LEVEL_TYPE_MODULE    3
+#define CPUID_TOPOLOGY_LEVEL_TYPE_TILE      4
+#define CPUID_TOPOLOGY_LEVEL_TYPE_DIE       5
 
 #define CPUID_AMD_LEAF85_L1_CACHE_FULLY_ASSOC     0xff
 #define CPUID_AMD_LEAF86_L2_L3_CACHE_FULLY_ASSOC  0x0f