From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 24 Apr 2018 00:08:16 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-10.3.0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4b7b227119712c90be4a3583d4430a3fcc1d093;p=thirdparty%2Fopen-vm-tools.git

Change to common header file 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 2a26604ca..5b9cb4cee 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1381,8 +1381,8 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 /* Effective VIA CPU Families */
 #define CPUID_FAMILY_C7               6
 
-/* Effective Higon CPU Families */
-#define CPUID_FAMILY_DHYANA           1
+/* Effective Hygon CPU Families. */
+#define CPUID_FAMILY_DHYANA          0x18
 
 /* Intel model information */
 #define CPUID_MODEL_PPRO              1
@@ -1466,8 +1466,8 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 /* VIA model information */
 #define CPUID_MODEL_NANO                15 // Isaiah
 
-/* Higon model information */
-#define CPUID_MODEL_DHYANA_A0            0 // Dhyana A0
+/* Hygon model information. */
+#define CPUID_MODEL_DHYANA_A             0 // Dhyana A
 
 /*
  *----------------------------------------------------------------------
@@ -2008,10 +2008,10 @@ CPUID_FAMILY_IS_DHYANA(uint32 eax)
 
 
 static INLINE Bool
-CPUID_MODEL_IS_DHYANA_A0(uint32 eax)
+CPUID_MODEL_IS_DHYANA_A(uint32 eax)
 {
    return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_DHYANA &&
-          CPUID_EFFECTIVE_MODEL(eax)  == CPUID_MODEL_DHYANA_A0;
+          CPUID_EFFECTIVE_MODEL(eax)  == CPUID_MODEL_DHYANA_A;
 }