From: VMware, Inc <> Date: Mon, 26 Sep 2011 19:53:20 +0000 (-0700) Subject: Changes in shared code that don't affect open-vm-tools functionality. X-Git-Tag: 2011.09.23-491607~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe5a6484c9df7af37dea85acf997d96e30efddc0;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 cdea35357..b464ae91e 100644 --- a/open-vm-tools/lib/include/x86cpuid.h +++ b/open-vm-tools/lib/include/x86cpuid.h @@ -390,9 +390,13 @@ 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, INTEL, 7, 1, SMEP, YES, FALSE) \ FLAG( 7, 0, EBX, INTEL, 9, 1, ENFSTRG, YES, FALSE) @@ -508,6 +512,8 @@ FLAG( 81, 0, EDX, COMMON, 29, 1, LM, YES, FALSE) \ FLAG( 81, 0, EDX, AMD, 30, 1, 3DNOWPLUS, YES, TRUE) \ FLAG( 81, 0, EDX, AMD, 31, 1, 3DNOW, YES, TRUE) +#define CPUID_8A_EDX_11 \ +FLAG( 8A, 0, EDX, AMD, 11, 1, SVMEDX_RSVD1, NO, FALSE) #define CPUID_8A_EDX_13_31 \ FIELD( 8A, 0, EDX, AMD, 13, 19, SVMEDX_RSVD2, NO, FALSE) @@ -575,7 +581,7 @@ FLAG( 8A, 0, EDX, AMD, 6, 1, SVM_FLUSH_BY_ASID, YES, FALSE) \ FLAG( 8A, 0, EDX, AMD, 7, 1, SVM_DECODE_ASSISTS, YES, FALSE) \ FIELD( 8A, 0, EDX, AMD, 8, 2, SVMEDX_RSVD0, NO, FALSE) \ FLAG( 8A, 0, EDX, AMD, 10, 1, SVM_PAUSE_FILTER, NO, FALSE) \ -FLAG( 8A, 0, EDX, AMD, 11, 1, SVMEDX_RSVD1, NO, FALSE) \ +CPUID_8A_EDX_11 \ FLAG( 8A, 0, EDX, AMD, 12, 1, SVM_PAUSE_THRESHOLD, NO, FALSE) \ CPUID_8A_EDX_13_31