Common header file change 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 ed86c51dd7bf9f9e07788a6c91f986aa81361b00..f64c2f6f917a674e3456dda2afb4b950918f2db3 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -2179,40 +2179,13 @@ CPUID_MODEL_IS_DHYANA_A(uint32 eax)
  * places to ensure ordering.
  */
 
-static INLINE Bool
-CPUID_VendorRequiresFence(CpuidVendor vendor)
-{
-   return vendor == CPUID_VENDOR_AMD;
-}
-
-static INLINE Bool
-CPUID_VersionRequiresFence(uint32 version)
-{
-   return CPUID_EFFECTIVE_FAMILY(version) == CPUID_FAMILY_K8 &&
-          CPUID_EFFECTIVE_MODEL(version) < 0x40;
-}
-
-static INLINE Bool
-CPUID_ID0RequiresFence(CPUIDRegs *id0)
-{
-   if (id0->eax == 0) {
-      return FALSE;
-   }
-   return CPUID_IsVendorAMD(id0);
-}
-
-static INLINE Bool
-CPUID_ID1RequiresFence(CPUIDRegs *id1)
-{
-   return CPUID_VersionRequiresFence(id1->eax);
-}
-
 static INLINE Bool
 CPUID_RequiresFence(CpuidVendor vendor, // IN
-                    uint32 version)      // IN: %eax from CPUID with %eax=1.
+                    uint32 version)     // IN: %eax from CPUID with %eax=1.
 {
-   return CPUID_VendorRequiresFence(vendor) &&
-          CPUID_VersionRequiresFence(version);
+   return vendor == CPUID_VENDOR_AMD &&
+          CPUID_EFFECTIVE_FAMILY(version) == CPUID_FAMILY_K8 &&
+          CPUID_EFFECTIVE_MODEL(version) < 0x40;
 }