MdeModulePkg/Core: fix an IA32 build failure

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Mem / HeapGuard.c

diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
index 449a02265834b438f51de21939a370303a05010b..521e0d7b2a77831a206a458b89eaad2426acf550 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
+++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
@@ -463,7 +463,7 @@ IsGuardPage (
   IN EFI_PHYSICAL_ADDRESS    Address\r
   )\r
 {\r
-  UINTN       BitMap;\r
+  UINT64        BitMap;\r
 \r
   //\r
   // There must be at least one guarded page before and/or after given\r
@@ -1368,7 +1368,7 @@ GuardAllFreedPages (
   UINT64    Address;\r
   UINT64    GuardPage;\r
   INTN      Level;\r
-  UINTN     BitIndex;\r
+  UINT64    BitIndex;\r
   UINTN     GuardPageNumber;\r
 \r
   if (mGuardedMemoryMap == 0 ||\r
@@ -1475,12 +1475,12 @@ MergeGuardPages (
   }\r
 \r
   Bitmap = 0;\r
-  Pages  = EFI_SIZE_TO_PAGES (MaxAddress - MemoryMapEntry->PhysicalStart);\r
-  Pages -= MemoryMapEntry->NumberOfPages;\r
+  Pages  = EFI_SIZE_TO_PAGES ((UINTN)(MaxAddress - MemoryMapEntry->PhysicalStart));\r
+  Pages -= (INTN)MemoryMapEntry->NumberOfPages;\r
   while (Pages > 0) {\r
     if (Bitmap == 0) {\r
       EndAddress = MemoryMapEntry->PhysicalStart +\r
-                   EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages);\r
+                   EFI_PAGES_TO_SIZE ((UINTN)MemoryMapEntry->NumberOfPages);\r
       Bitmap = GetGuardedMemoryBits (EndAddress, GUARDED_HEAP_MAP_ENTRY_BITS);\r
     }\r
 \r