]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Fix a bug in load modules at fixed address which may potentially impact OS S3.
authorjchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 4 Mar 2010 03:16:55 +0000 (03:16 +0000)
committerjchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 4 Mar 2010 03:16:55 +0000 (03:16 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10175 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c

index d96182cd972b0f82ae63114ea9b6e80d03f659fa..455c79b1bb49298c33f8782b328d0d8fc694dc48 100644 (file)
@@ -946,7 +946,7 @@ PeiDispatcher (
               //\r
               PrivateInMem->PeimDispatcherReenter  = TRUE;\r
               \r
-              if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
+              if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
                 //\r
                 // if Loading Module at Fixed Address is enabled, allocate the PEI code memory range usage bit map array.\r
                 // Every bit in the array indicate the status of the corresponding memory page available or not\r