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 0e375af85ddd0e47ab8b8e5bf8ce8f171de170f4..2a4e1c8cb120b5e951bcf923f746a9c80c337c16 100644 (file)
--- 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__