From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 19 Nov 2021 19:40:50 +0000 (-0800)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9997bb0c311e5d931d53f1a4328ced07ec911b77;p=thirdparty%2Fopen-vm-tools.git

Change to common header file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/x86_basic_defs.h b/open-vm-tools/lib/include/x86_basic_defs.h
index 22ff7d5bc..93f320675 100644
--- a/open-vm-tools/lib/include/x86_basic_defs.h
+++ b/open-vm-tools/lib/include/x86_basic_defs.h
@@ -75,7 +75,9 @@
 #define CR3_PDB_MASK   0xfffff000
 #define CR3_IGNORE     0xFFF
 #define PAE_CR3_IGNORE 0x1F
+#ifndef CR3_PCID_MASK
 #define CR3_PCID_MASK  0xFFF
+#endif
 #define CR3_NO_FLUSH   (1ULL << 63)
 
 #define CR4_VME        0x00000001