From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 3 Jun 2019 20:39:44 +0000 (-0700)
Subject: Common source file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78a6801a8ec0f549fc3aa3817215f91cf6607af;p=thirdparty%2Fopen-vm-tools.git

Common source 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 6afd4a88a..73648e351 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1355,18 +1355,6 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
              CPUID_INTERNAL_SHIFT_##field);                             \
    } while (0)
 
-#define CPUID_SETTO_SAFE(eaxIn, reg, field, dataPtr, val)               \
-   do {                                                                 \
-      uint32 _v = val &                                                 \
-         (CPUID_INTERNAL_MASK_##field >> CPUID_INTERNAL_SHIFT_##field); \
-      uint32 *_d = dataPtr;                                             \
-      ASSERT_ON_COMPILE(                                                \
-         (uint32)eaxIn   == (uint32)CPUID_INTERNAL_EAXIN_##field &&     \
-         CPUID_REG_##reg == (CpuidReg)CPUID_INTERNAL_REG_##field);      \
-      *_d = (*_d & ~CPUID_INTERNAL_MASK_##field) |                      \
-         (_v << CPUID_INTERNAL_SHIFT_##field);                          \
-   } while (0)
-
 
 /*
  * Definitions of various fields' values and more complicated