From: jchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 4 Mar 2010 03:10:41 +0000 (+0000)
Subject: Fix a bug in LMFA which may potentially impact OS S3.
X-Git-Tag: edk2-stable201903~16162
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f73b3df815a4455ec924aca81142e9930acda010;p=mirror_edk2.git

Fix a bug in LMFA which may potentially impact OS S3.

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

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index eed0c1cdc9..d96182cd97 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -796,7 +796,7 @@ PeiDispatcher (
                       ));
               DEBUG_CODE_END ();
               
-              if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
+              if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {
                 //
                 // Loading Module at Fixed Address is enabled
                 //