Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index 7acb6e516008bf5d61e640e702cc666433e279be..247adc34b855e11a409f3be96c77ad4814a57417 100644 (file)
--- 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 7e5d2b2ad87730eb53df483a00704b6987198a3d..3b137c51ca6a23e53e7f598f69da258d9a50929b 100644 (file)
--- 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)