From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 20 Nov 2020 16:37:31 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea59704795a431c19fafe6e1b4ed4019b601c1c;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 0e375af85..2a4e1c8cb 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -181,6 +181,12 @@ Max(int a, int b)
 #if defined __APPLE__
 #include <machine/param.h>
 #undef MASK
+   #if defined VM_ARM_ANY
+      #include <mach/machine/vm_param.h>
+      #undef PAGE_SHIFT
+      #undef PAGE_SIZE
+      #undef PAGE_MASK
+   #endif
 #endif
 
 /*
@@ -246,7 +252,11 @@ Max(int a, int b)
 #if defined __x86_64__ || defined __i386__
    #define PAGE_SHIFT    12
 #elif defined __APPLE__
-   #define PAGE_SHIFT    12
+   #if defined VM_ARM_ANY
+      #define PAGE_SHIFT    14
+   #else
+      #define PAGE_SHIFT    12
+   #endif
 #elif defined VM_ARM_64
    #define PAGE_SHIFT    12
 #elif defined __arm__