diff options
| author | VMware, Inc <> | 2013-09-17 20:34:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-22 22:24:38 -0700 |
| commit | c0a9de0c3cc97503bb65a53bb391343232160cc0 (patch) | |
| tree | 9a98fedf519db67e92de47f9b5575494d0e3c9ea | |
| parent | 074d772ec4b0f2afcba169c2b6da3ed5a2baeb2f (diff) | |
Changes in shared code that don't affect open-vm-tools functionality.
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
| -rw-r--r-- | open-vm-tools/lib/include/loglevel_user.h | 1 | ||||
| -rw-r--r-- | open-vm-tools/lib/include/x86cpuid.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h index 7acb6e51..247adc34 100644 --- a/open-vm-tools/lib/include/loglevel_user.h +++ b/open-vm-tools/lib/include/loglevel_user.h @@ -132,6 +132,7 @@ LOGLEVEL_VAR(mksHostCursor), \ LOGLEVEL_VAR(mksCursorPosition), \ LOGLEVEL_VAR(mksRenderOps), \ + LOGLEVEL_VAR(mksGLBasic), \ LOGLEVEL_VAR(mksGLManager), \ LOGLEVEL_VAR(mksGLFBO), \ LOGLEVEL_VAR(mksGLShader), \ diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h index 7e5d2b2a..3b137c51 100644 --- a/open-vm-tools/lib/include/x86cpuid.h +++ b/open-vm-tools/lib/include/x86cpuid.h @@ -973,9 +973,9 @@ CPUIDCheck(uint32 eaxIn, uint32 eaxInCheck, #define CPUID_MODEL_SANDYBRIDGE_3A 0x3a // Ivy Bridge #define CPUID_MODEL_SANDYBRIDGE_3E 0x3e // Ivy Bridge-EP #define CPUID_MODEL_HASWELL_3C 0x3c // Haswell DT -#define CPUID_MODEL_HASWELL_3F 0x3f // Haswell EN/EP/EX +#define CPUID_MODEL_HASWELL_3F 0x3f // Haswell EP/EN/EX #define CPUID_MODEL_HASWELL_45 0x45 // Haswell Ultrathin -#define CPUID_MODEL_HASWELL_46 0x46 // CrystalWell +#define CPUID_MODEL_HASWELL_46 0x46 // Haswell (Crystal Well) |