From: Oliver Kurth Date: Fri, 26 Oct 2018 17:44:58 +0000 (-0700) Subject: Common header file change not applicable to open-vm-tools X-Git-Tag: stable-11.0.0~370 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74401197479cca7db92d52ed61dced7a5b9fcc77;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 92588e275..e9c5ff910 100644 --- a/open-vm-tools/lib/include/x86cpuid.h +++ b/open-vm-tools/lib/include/x86cpuid.h @@ -481,9 +481,6 @@ FLAG( 6, 0, EDX, 1, 1, ENERGY_CAP_REPORTING, NO, 0, FALSE) \ FIELD( 6, 0, EDX, 8, 4, HW_FEEDBACK_SIZE, NO, 0, FALSE) \ FIELD( 6, 0, EDX, 16, 16, HW_FEEDBACK_INDEX, NO, 0, FALSE) -#define CPUID_7_EDX_28 \ -FLAG( 7, 0, EDX, 28, 1, LEVEL7EDX_RSVD1, NO, 0, FALSE) - /* LEVEL, SUB-LEVEL, REG, POS, SIZE, NAME, MON SUPP, HWV, CPL3 */ #define CPUID_FIELD_DATA_LEVEL_7 \ FLAG( 7, 0, EBX, 0, 1, FSGSBASE, YES, 9, FALSE) \ @@ -543,7 +540,7 @@ FLAG( 7, 0, EDX, 4, 1, FAST_SHORT_REPMOV, NO , 0, TRUE) \ FLAG( 7, 0, EDX, 18, 1, PCONFIG, NO , 0, FALSE) \ FLAG( 7, 0, EDX, 26, 1, IBRSIBPB, ANY, 9, FALSE) \ FLAG( 7, 0, EDX, 27, 1, STIBP, YES, 9, FALSE) \ -CPUID_7_EDX_28 \ +FLAG( 7, 0, EDX, 28, 1, FCMD, YES, 9, FALSE) \ FLAG( 7, 0, EDX, 29, 1, ARCH_CAPABILITIES, ANY, 9, FALSE) \ FLAG( 7, 0, EDX, 31, 1, SSBD, YES, 9, FALSE)