From: VMware, Inc <> Date: Thu, 22 Dec 2011 00:04:04 +0000 (-0800) Subject: Changes in shared code that don't affect open-vm-tools functionality. X-Git-Tag: 2011.12.20-562307~62 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=735202ac583a1b15eb4f546d7330ec35ea3e21cd;p=thirdparty%2Fopen-vm-tools.git Changes in shared code that don't affect open-vm-tools functionality. Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h index 9be3c794a..ac56d56f8 100644 --- a/open-vm-tools/lib/include/x86cpuid.h +++ b/open-vm-tools/lib/include/x86cpuid.h @@ -387,13 +387,10 @@ FIELD( 6, 0, EBX, INTEL, 0, 4, NUM_INTR_THRESHOLDS, NA, FALSE) \ FLAG( 6, 0, ECX, INTEL, 0, 1, HW_COORD_FEEDBACK, NA, FALSE) \ FLAG( 6, 0, ECX, INTEL, 3, 1, ENERGY_PERF_BIAS, NA, FALSE) - -#define CPUID_7_EBX_3 - /* LEVEL, SUB-LEVEL, REG, VENDOR, POS, SIZE, NAME, MON SUPP, CPL3 */ #define CPUID_FIELD_DATA_LEVEL_7 \ FLAG( 7, 0, EBX, INTEL, 0, 1, FSGSBASE, YES, FALSE) \ -CPUID_7_EBX_3 \ +FLAG( 7, 0, EBX, AMD, 3, 1, BMI1, YES, TRUE ) \ FLAG( 7, 0, EBX, INTEL, 7, 1, SMEP, YES, FALSE) \ FLAG( 7, 0, EBX, INTEL, 9, 1, ENFSTRG, YES, FALSE) \ FLAG( 7, 0, EBX, INTEL, 10, 1, INVPCID, NO, FALSE) @@ -464,7 +461,6 @@ FIELD( 80, 0, ECX, AMD, 0, 32, LEAF80_VENDOR3, NA, FALSE) \ FIELD( 80, 0, EDX, AMD, 0, 32, LEAF80_VENDOR2, NA, FALSE) #define CPUID_81_ECX_17 -#define CPUID_81_ECX_21 /* LEVEL, SUB-LEVEL, REG, VENDOR, POS, SIZE, NAME, MON SUPP, CPL3 */ @@ -497,7 +493,7 @@ FLAG( 81, 0, ECX, AMD, 15, 1, LWP, NO, FALSE) \ FLAG( 81, 0, ECX, AMD, 16, 1, FMA4, YES, TRUE) \ CPUID_81_ECX_17 \ FLAG( 81, 0, ECX, AMD, 19, 1, NODEID_MSR, NO, FALSE) \ -CPUID_81_ECX_21 \ +FLAG( 81, 0, ECX, AMD, 21, 1, TBM, YES, TRUE) \ FLAG( 81, 0, ECX, AMD, 22, 1, TOPOLOGY, NO, FALSE) \ FLAG( 81, 0, EDX, AMD, 0, 1, LEAF81_FPU, YES, TRUE) \ FLAG( 81, 0, EDX, AMD, 1, 1, LEAF81_VME, YES, FALSE) \