From 710735264ba7d40751663c541db0e8154b9f29f9 Mon Sep 17 00:00:00 2001 From: Oliver Kurth Date: Wed, 2 Oct 2019 17:48:34 -0700 Subject: [PATCH] Common header file change not applicable to open-vm-tools. --- open-vm-tools/lib/include/x86cpuid.h | 35 ++++------------------------ 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h index ed86c51dd..f64c2f6f9 100644 --- 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; } -- 2.47.3