From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 5 Jun 2018 22:45:03 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77d6d2bf3f8965302f258b27b433fa6dc2183c00;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_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 92bf06e7a..8c9e5bef4 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -618,8 +618,6 @@ typedef uint64 MPN;
  */
 #define PPN64_2_PPN(_ppn)     ((PPN)_ppn)
 
-#define FMTPPN ""
-
 /*
  * IO device DMA virtual address and page number (translated by IOMMU to
  * MA/MPN). IOPN can be in the inclusive range 0 -> MAX_IOPN.
@@ -642,12 +640,14 @@ typedef void * UserVA;
 #endif
 
 
+/* Maximal observable PPN value. */
 #define MAX_PPN_BITS      31
-#define MAX_PPN           (((PPN)1 << MAX_PPN_BITS) - 1) /* Maximal observable PPN value. */
-#define INVALID_PPN       ((PPN)0xffffffff)
+#define MAX_PPN           (((PPN64)1 << MAX_PPN_BITS) - 1)
+
+#define INVALID_PPN       ((PPN64)0xffffffff)
 #define INVALID_PPN32     ((PPN32)0xffffffff)
 #define INVALID_PPN64     ((PPN64)0xffffffffffffffffull)
-#define APIC_INVALID_PPN  ((PPN)0xfffffffe)
+#define APIC_INVALID_PPN  ((PPN64)0xfffffffe)
 
 #define INVALID_BPN       ((BPN)0x000000ffffffffffull)