1 files changed, 10 insertions, 5 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Common/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Common/RuntimeLib.c
index 6cc2da31b0..387a6835a6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Common/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Common/RuntimeLib.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -29,7 +29,7 @@ Abstract:
 STATIC EFI_EVENT              mEfiVirtualNotifyEvent;
 STATIC BOOLEAN                mEfiGoneVirtual         = FALSE;
 STATIC BOOLEAN                mEfiAtRuntime           = FALSE;
-EFI_RUNTIME_SERVICES          *mRT;
+EFI_RUNTIME_SERVICES          *mRTEdkDxeRuntimeDriverLib;
 
 /**
   Set AtRuntime flag as TRUE after ExitBootServices
@@ -44,6 +44,11 @@ RuntimeDriverExitBootServices (
   IN VOID             *Context
   )
 {
+  //
+  // Clear out BootService globals
+  //
+  gBS             = NULL;
+
   mEfiAtRuntime = TRUE;
 }
 
@@ -76,7 +81,7 @@ RuntimeLibVirtualNotifyEvent (
   //
   // Update global for Runtime Services Table and IO
   //
-  EfiConvertPointer (0, (VOID **) &mRT);
+  EfiConvertPointer (0, (VOID **) &mRTEdkDxeRuntimeDriverLib);
 
   mEfiGoneVirtual = TRUE;
 }
@@ -99,8 +104,8 @@ RuntimeDriverLibConstruct (
   EFI_STATUS  Status;
 
   ASSERT (SystemTable != NULL);
-  mRT = SystemTable->RuntimeServices;
-  ASSERT (mRT != NULL);
+  mRTEdkDxeRuntimeDriverLib = SystemTable->RuntimeServices;
+  ASSERT (mRTEdkDxeRuntimeDriverLib != NULL);
   
   //
   // Register SetVirtualAddressMap () notify function