summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>2010-03-04 03:16:55 +0000
committerjchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>2010-03-04 03:16:55 +0000
commitdef75b5dadfe38126ca04495b7d7bd587847a7eb (patch)
tree8665fb10ede4bbe10497279e3cd5c305fcc19cd0
parentf73b3df815a4455ec924aca81142e9930acda010 (diff)
downloadedk2-platforms-def75b5dadfe38126ca04495b7d7bd587847a7eb.tar.xz
Fix a bug in load modules at fixed address which may potentially impact OS S3.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10175 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index d96182cd97..455c79b1bb 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -946,7 +946,7 @@ PeiDispatcher (
//
PrivateInMem->PeimDispatcherReenter = TRUE;
- if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
+ if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {
//
// if Loading Module at Fixed Address is enabled, allocate the PEI code memory range usage bit map array.
// Every bit in the array indicate the status of the corresponding memory page available or not