From 626f6f6e74626a9d85d6c8ca2fa8473045580fcf Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Mon, 6 Jun 2016 18:27:16 +0800 Subject: [PATCH] MdeModulePkg DxeS3BootScriptLib: Revert git commit 058196bbb345 With a destructor implemented, the shortcut from 058196bbb345 should be unnecessary. Cc: Jiewen Yao Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Suggested-by: Laszlo Ersek Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek --- MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c | 4 ---- .../Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf | 1 - 2 files changed, 5 deletions(-) diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c index 0bd0bd04f6..f6de986e08 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c @@ -443,10 +443,6 @@ S3BootScriptLibInitialize ( BOOLEAN InSmm; EFI_PHYSICAL_ADDRESS Buffer; - if (!PcdGetBool (PcdAcpiS3Enable)) { - return RETURN_SUCCESS; - } - S3TablePtr = (SCRIPT_TABLE_PRIVATE_DATA*)(UINTN)PcdGet64(PcdS3BootScriptTablePrivateDataPtr); // // The Boot script private data is not be initialized. create it diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf index 0f4151180f..de314db479 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf @@ -71,5 +71,4 @@ ## SOMETIMES_PRODUCES gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptRuntimeTableReservePageNumber ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES -- 2.39.2