1 files changed, 15 insertions, 15 deletions
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
index d80a71cda2..12f06e1324 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
@@ -13,10 +13,6 @@ Module Name:
 
     RuntimeLib.c
 
-Abstract:
-
-  Light weight lib to support Tiano drivers.
-
 --*/
 
 #include <RuntimeLibInternal.h>
@@ -24,13 +20,15 @@ Abstract:
 //
 // Driver Lib Module Globals
 //
-STATIC EFI_EVENT            mRuntimeNotifyEvent;
-STATIC EFI_EVENT            mEfiVirtualNotifyEvent;
-STATIC BOOLEAN              mEfiGoneVirtual         = FALSE;
-STATIC BOOLEAN              mEfiAtRuntime           = FALSE;
 
-EFI_RUNTIME_SERVICES        *mRT                    = NULL;
+STATIC EFI_EVENT              mRuntimeNotifyEvent;
+STATIC EFI_EVENT              mEfiVirtualNotifyEvent;
+STATIC BOOLEAN                mEfiGoneVirtual         = FALSE;
+STATIC BOOLEAN                mEfiAtRuntime           = FALSE;
 
+EFI_RUNTIME_SERVICES          *mRT;
+
+STATIC
 VOID
 EFIAPI
 RuntimeDriverExitBootServices (
@@ -65,6 +63,11 @@ Returns:
     ChildNotifyEventHandler (Event, NULL);
   }
 
+  //
+  // Clear out BootService globals
+  //
+  gBS             = NULL;
+
   mEfiAtRuntime = TRUE;
 }
 
@@ -108,13 +111,8 @@ Returns:
   //
   // Update global for Runtime Services Table and IO
   //
-  EfiConvertInternalPointer ((VOID **) &mRT);
+  EfiConvertPointer (0, (VOID **) &mRT);
 
-  //
-  // Clear out BootService globals
-  //
-  gBS             = NULL;
-  gST             = NULL;
   mEfiGoneVirtual = TRUE;
 }
 
@@ -219,6 +217,7 @@ Returns:
 }
 
 BOOLEAN
+EFIAPI
 EfiAtRuntime (
   VOID
   )
@@ -239,6 +238,7 @@ Returns:
 }
 
 BOOLEAN
+EFIAPI
 EfiGoneVirtual (
   VOID
   )