2 files changed, 7 insertions, 6 deletions
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index e4ef1a0b7c..c3102950c5 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -230,7 +230,7 @@ typedef struct {
   @retval EFI_NOT_FOUND  Never reach
 
 **/
-EFI_STATUS
+VOID
 EFIAPI
 PeiCore (
   IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,
diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 8055659129..32f875b688 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -86,7 +86,7 @@ STATIC EFI_PEI_SERVICES  gPs = {
   @retval EFI_NOT_FOUND  Never reach
 
 **/
-EFI_STATUS
+VOID
 EFIAPI
 PeiCore (
   IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,
@@ -156,7 +156,7 @@ PeiCore (
   //
   // Initialize libraries that the PeiCore is linked against
   //
-  ProcessLibraryConstructorList (NULL, &PrivateData.PS);
+  ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.PS);
 
   InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);
 
@@ -247,10 +247,11 @@ PeiCore (
                              &PrivateData.PS,
                              PrivateData.HobList
                              );
-
+  //
+  // Should never reach here.
+  //
   ASSERT_EFI_ERROR (Status);
-
-  return EFI_NOT_FOUND;
+  CpuDeadLoop();
 }