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

Common header file changes 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 68067eaee..0d779079c 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1513,7 +1513,7 @@ CPUID_IsVendorVIA(CPUIDRegs *id0)
 }
 
 static INLINE Bool
-CPUID_IsVendorHigon(CPUIDRegs *id0)
+CPUID_IsVendorHygon(CPUIDRegs *id0)
 {
    return CPUID_IsRawVendor(id0, CPUID_HIGON_VENDOR_STRING);
 }
diff --git a/open-vm-tools/lib/include/x86vendor.h b/open-vm-tools/lib/include/x86vendor.h
index d6cea5db4..8b5e9f635 100644
--- a/open-vm-tools/lib/include/x86vendor.h
+++ b/open-vm-tools/lib/include/x86vendor.h
@@ -45,8 +45,11 @@ typedef enum {
    CPUID_VENDOR_AMD,
    CPUID_VENDOR_CYRIX,
    CPUID_VENDOR_VIA,
-   CPUID_VENDOR_HIGON,
+   CPUID_VENDOR_HYGON,
    CPUID_NUM_VENDORS
 } CpuidVendor;
 
+//XXX Temporary until rename is complete
+#define CPUID_VENDOR_HIGON CPUID_VENDOR_HYGON
+
 #endif