From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Feb 2019 20:51:32 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35eae094a31571d806ffdb82c479a425a865bfda;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 fba50f193..969a74557 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -994,17 +994,6 @@ FLAG(  87,  0, EDX,  7,  1, HWPSTATE,                          NA,   0, FALSE) \
 FLAG(  87,  0, EDX,  8,  1, TSC_INVARIANT,                     NA,   0, FALSE) \
 FLAG(  87,  0, EDX,  9,  1, CORE_PERF_BOOST,                   NA,   0, FALSE)
 
-#define CPUID_88_EBX_14 \
-FLAG(  88,  0, EBX, 14,  1, LEAF88_RSVD1,                       NO,  0, FALSE)
-#define CPUID_88_EBX_15 \
-FLAG(  88,  0, EBX, 15,  1, LEAF88_RSVD2,                       NO,  0, FALSE)
-#define CPUID_88_EBX_16 \
-FLAG(  88,  0, EBX, 16,  1, LEAF88_RSVD3,                       NO,  0, FALSE)
-#define CPUID_88_EBX_17 \
-FLAG(  88,  0, EBX, 17,  1, LEAF88_RSVD4,                       NO,  0, FALSE)
-#define CPUID_88_EBX_18 \
-FLAG(  88,  0, EBX, 18,  1, LEAF88_RSVD5,                       NO,  0, FALSE)
-
 /*    LEVEL, REG, POS, SIZE, NAME,                        MON SUPP, HWV, CPL3 */
 #define CPUID_FIELD_DATA_LEVEL_88                                              \
 FIELD( 88,  0, EAX,  0,  8, PHYS_BITS,                         YES,  4, FALSE) \
@@ -1015,11 +1004,11 @@ FLAG(  88,  0, EBX,  1,  1, IRPERF,                            NO,   0, FALSE) \
 FLAG(  88,  0, EBX,  2,  1, XSAVE_ERR_PTR,                     NO,   0, FALSE) \
 FLAG(  88,  0, EBX,  9,  1, WBNOINVD,                          YES, 17, FALSE) \
 FLAG(  88,  0, EBX, 12,  1, LEAF88_IBPB,                       ANY,  9, FALSE) \
-CPUID_88_EBX_14 \
-CPUID_88_EBX_15 \
-CPUID_88_EBX_16 \
-CPUID_88_EBX_17 \
-CPUID_88_EBX_18 \
+FLAG(  88,  0, EBX, 14,  1, LEAF88_IBRS,                        NO,  0, FALSE) \
+FLAG(  88,  0, EBX, 15,  1, LEAF88_STIBP,                       NO,  0, FALSE) \
+FLAG(  88,  0, EBX, 16,  1, LEAF88_IBRS_ALWAYS,                 NO,  0, FALSE) \
+FLAG(  88,  0, EBX, 17,  1, LEAF88_STIBP_ALWAYS,                NO,  0, FALSE) \
+FLAG(  88,  0, EBX, 18,  1, LEAF88_PREFER_IBRS,                 NO,  0, FALSE) \
 FLAG(  88,  0, EBX, 24,  1, LEAF88_SSBD_SPEC_CTRL,             ANY,  9, FALSE) \
 FLAG(  88,  0, EBX, 25,  1, LEAF88_SSBD_VIRT_SPEC_CTRL,        ANY,  9, FALSE) \
 FLAG(  88,  0, EBX, 26,  1, LEAF88_SSBD_NOT_NEEDED,            NO,   0, FALSE) \