Merging uefi-next/linaro-release into masterlinaro-uefi-2013.09

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

1 files changed, 9 insertions, 5 deletions

diff --git a/OvmfPkg/Library/LoadLinuxLib/Linux.c b/OvmfPkg/Library/LoadLinuxLib/Linux.c
index c714225e5..4a3e2c13c 100644
--- a/OvmfPkg/Library/LoadLinuxLib/Linux.c
+++ b/OvmfPkg/Library/LoadLinuxLib/Linux.c
@@ -280,8 +280,12 @@ SetupLinuxMemmap (
   // Enlarge space here, because we will allocate pool now.

   //

   MemoryMapSize += EFI_PAGE_SIZE;

-  MemoryMap = AllocatePool (MemoryMapSize);

-  ASSERT (MemoryMap != NULL);

+  Status = gBS->AllocatePool (

+                  EfiLoaderData,

+                  MemoryMapSize,

+                  (VOID **) &MemoryMap

+                  );

+  ASSERT_EFI_ERROR (Status);

 

   //

   // Get System MemoryMap

@@ -349,15 +353,15 @@ SetupLinuxMemmap (
     if ((LastE820 != NULL) &&

         (LastE820->type == (UINT32) E820Type) &&

         (MemoryMap->PhysicalStart == LastEndAddr)) {

-      LastE820->size += EFI_PAGES_TO_SIZE (MemoryMap->NumberOfPages);

-      LastEndAddr += EFI_PAGES_TO_SIZE (MemoryMap->NumberOfPages);

+      LastE820->size += EFI_PAGES_TO_SIZE ((UINTN) MemoryMap->NumberOfPages);

+      LastEndAddr += EFI_PAGES_TO_SIZE ((UINTN) MemoryMap->NumberOfPages);

     } else {

       if (E820EntryCount >= (sizeof (Bp->e820_map) / sizeof (Bp->e820_map[0]))) {

         break;

       }

       E820->type = (UINT32) E820Type;

       E820->addr = MemoryMap->PhysicalStart;

-      E820->size = EFI_PAGES_TO_SIZE (MemoryMap->NumberOfPages);

+      E820->size = EFI_PAGES_TO_SIZE ((UINTN) MemoryMap->NumberOfPages);

       LastE820 = E820;

       LastEndAddr = E820->addr + E820->size;

       E820++;