open-vm-tools/vmw-bitmask-gcc6.patch

18 lines
719 B
Diff

Index: open-vm-tools/lib/include/x86cpuid.h
===================================================================
--- open-vm-tools.orig/lib/include/x86cpuid.h
+++ open-vm-tools/lib/include/x86cpuid.h
@@ -905,11 +905,8 @@ FIELD(81E, 0, ECX, 8, 3, NODES_PER_PK
*
* e.g. - CPUID_VIRT_BITS_MASK = 0xff00
* - CPUID_VIRT_BITS_SHIFT = 8
- *
- * Note: The MASK definitions must use some gymnastics to get
- * around a warning when shifting left by 32.
*/
-#define VMW_BIT_MASK(shift) (((1 << (shift - 1)) << 1) - 1)
+#define VMW_BIT_MASK(shift) (0xffffffffu >> (32 - shift))
#define FIELD(lvl, ecxIn, reg, bitpos, size, name, s, c3) \
CPUID_##name##_SHIFT = bitpos, \