roll back change

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4373 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 17 deletions

diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index 67dd803861..1a98e97e9a 100644
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
@@ -412,14 +412,11 @@ Returns:
   UINTN                                                 Instance;

   UINT8                                                 *CopyBuffer;

   UINTN                                                 SectionSize;

-  EFI_FIRMWARE_VOLUME_HEADER                            *FvHeader;

-  UINT32                                                FvAlignment;  

-  

   

+

   OldTpl = CoreRaiseTpl (TPL_NOTIFY);

   Instance = SectionInstance + 1;

-  FvHeader = NULL;

-  FvAlignment = 0;

+  

   //

   // Locate target stream

   //

@@ -472,19 +469,8 @@ Returns:
   } else {

     //

     // Callee allocated buffer.  Allocate buffer and return size.

-    // For FvImage, the buffer is allocated at its required alignment.

     //

-    if (*SectionType == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) {

-      FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) CopyBuffer;

-      FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);

-      //

-      // FvAlignment must be more than 8 bytes required by FvHeader structure.

-      // 

-      if (FvAlignment < 8) {

-        FvAlignment = 8;

-      }

-    }

-    *Buffer = AllocateAlignedPool ((UINTN) CopySize, (UINTN) FvAlignment);

+    *Buffer = CoreAllocateBootServicesPool (CopySize);

     if (*Buffer == NULL) {

       Status = EFI_OUT_OF_RESOURCES;

       goto GetSection_Done;