From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 22 Sep 2020 21:54:07 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9338c579fba6ee1f8d3a50df63f67cec7785d71b;p=thirdparty%2Fopen-vm-tools.git

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 3b089ce0b..ce03bc50a 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -2362,30 +2362,6 @@ CPUID_LevelUsesEcx(uint32 level) {
    }
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * CPUID_SupportsMsrPlatformInfo --
- *
- *    Uses vendor and cpuid.1.0.eax to determine if the processor
- *    supports MSR_PLATFORM_INFO.
- *
- *----------------------------------------------------------------------
- */
-static INLINE Bool
-CPUID_SupportsMsrPlatformInfo(CpuidVendor vendor, uint32 version)
-{
-   return vendor == CPUID_VENDOR_INTEL &&
-          (CPUID_UARCH_IS_NEHALEM(version)     ||
-           CPUID_UARCH_IS_SANDYBRIDGE(version) ||
-           CPUID_UARCH_IS_HASWELL(version)     ||
-           CPUID_UARCH_IS_SKYLAKE(version)     ||
-           CPUID_MODEL_IS_KNIGHTS_LANDING(version) ||
-           CPUID_MODEL_IS_DENVERTON(version)   ||
-           CPUID_UARCH_IS_SILVERMONT(version)  ||
-           CPUID_UARCH_IS_TREMONT(version));
-}
-
 #ifdef _MSC_VER
 #pragma warning (pop)
 #endif