summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2010-11-11 05:45:58 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2010-11-11 05:45:58 +0000
commit72454d76bcf1ed144a6b4ba4aeef11a891e2cc27 (patch)
treeb607db3be5284df925378269c5508c82d627e908
parent31f3fa88735181fd814880304abb38dc2a66016b (diff)
downloadedk2-72454d76bcf1ed144a6b4ba4aeef11a891e2cc27.tar.gz
sync patch r10999 from main trunk.
Swaps the order of timer disable and memory map termination to make sure memory map unchanged. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010@11029 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 8c731a379c..08fb88848e 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -668,6 +668,11 @@ CoreExitBootServices (
EFI_STATUS Status;
//
+ // Disable Timer
+ //
+ gTimer->SetTimerPeriod (gTimer, 0);
+
+ //
// Terminate memory services if the MapKey matches
//
Status = CoreTerminateMemoryMap (MapKey);
@@ -676,11 +681,6 @@ CoreExitBootServices (
}
//
- // Disable Timer
- //
- gTimer->SetTimerPeriod (gTimer, 0);
-
- //
// Notify other drivers that we are exiting boot services.
//
CoreNotifySignalList (&gEfiEventExitBootServicesGuid);