1 files changed, 7 insertions, 31 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c
index d9d5f70f46..93cef53e0f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c
@@ -792,7 +792,13 @@ Returns:
 
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000) 
   if (gStatusCode == NULL) {
-    return EFI_UNSUPPORTED;
+    if (EfiAtRuntime ()) {
+      return EFI_UNSUPPORTED;
+    }
+    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&gStatusCode);
+    if (EFI_ERROR (Status) || gStatusCode == NULL) {
+      return EFI_UNSUPPORTED;
+    }
   }
   Status = gStatusCode->ReportStatusCode (CodeType, Value, Instance, CallerId, Data);
 #else
@@ -811,33 +817,3 @@ Returns:
 #endif
   return Status;
 }
-
-//
-// Cache Flush Routine.
-//
-EFI_STATUS
-EfiCpuFlushCache (
-  IN EFI_PHYSICAL_ADDRESS          Start,
-  IN UINT64                        Length
-  )
-/*++
-
-Routine Description:
-
-  Flush cache with specified range.
-
-Arguments:
-
-  Start   - Start address
-  Length  - Length in bytes
-
-Returns:
-
-  Status code
-  
-  EFI_SUCCESS - success
-
---*/
-{
-  return EFI_SUCCESS;
-}