From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Tue, 24 Jun 2025 16:26:23 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.1.0~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e6fb667c05def9aeaf3d9dd92e233e2d632758b;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/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 49ca98b5a..6cffd6a8b 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -650,16 +650,20 @@ typedef void * UserVA;
 
 #define INVALID_BPN       ((BPN)0x0000ffffffffffffull)
 
-#define MPN38_MASK        ((1ull << 38) - 1)
+#if defined(VM_X86_ANY)
+#define MPN_MASK          ((1ull << 38) - 1)
+#elif defined(VM_ARM_64)
+#define MPN_MASK          ((1ull << 36) - 1) /* without FEAT_LPA{,2} */
+#endif
 
 #define RESERVED_MPN      ((MPN)0)
-#define INVALID_MPN       ((MPN)MPN38_MASK)
-#define MEMREF_MPN        ((MPN)MPN38_MASK - 1)
-#define RELEASED_MPN      ((MPN)MPN38_MASK - 2)
-#define ECC_CORRUPTED_MPN ((MPN)MPN38_MASK - 3)
+#define INVALID_MPN       ((MPN)MPN_MASK)
+#define MEMREF_MPN        ((MPN)MPN_MASK - 1)
+#define RELEASED_MPN      ((MPN)MPN_MASK - 2)
+#define ECC_CORRUPTED_MPN ((MPN)MPN_MASK - 3)
 
 /* account for special MPNs defined above */
-#define MAX_MPN           ((MPN)MPN38_MASK - 4) /* 50 bits of address space */
+#define MAX_MPN           ((MPN)MPN_MASK - 4)
 
 #define INVALID_IOPN      ((IOPN)-1)
 #define MAX_IOPN          (IOA_2_IOPN((IOA)-1))