tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3297

Rename the global variable mAcpiS3Enable to mS3BootScriptAcpiS3Enable
to avoid duplicate symbol errors from CLANGPDB tool change when
PiDxeS3BootScriptLib from the MdeModulePkg is linked with PiSmmCpuDxeSmm
from the UefiCpuPkg.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Michael D Kinney 2021-04-05 15:10:32 -07:00 committed by mergify[bot]
parent 4ac0296201
commit 9c08b3e7d5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
View File

@ -1,7 +1,7 @@
/** @file
Save the S3 data to S3 boot script.
Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@ -124,7 +124,7 @@ VOID *mRegistrationSmmReadyToLock = NULL;
BOOLEAN mS3BootScriptTableAllocated = FALSE;
BOOLEAN mS3BootScriptTableSmmAllocated = FALSE;
EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL;
BOOLEAN mAcpiS3Enable = TRUE;
BOOLEAN mS3BootScriptAcpiS3Enable = TRUE;
/**
This is an internal function to add a terminate node the entry, recalculate the table
@ -438,7 +438,7 @@ S3BootScriptLibInitialize (
EFI_PHYSICAL_ADDRESS Buffer;
if (!PcdGetBool (PcdAcpiS3Enable)) {
mAcpiS3Enable = FALSE;
mS3BootScriptAcpiS3Enable = FALSE;
DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3 disabled.\n", gEfiCallerBaseName));
return RETURN_SUCCESS;
}
@ -569,7 +569,7 @@ S3BootScriptLibDeinitialize (
{
EFI_STATUS Status;
if (!mAcpiS3Enable) {
if (!mS3BootScriptAcpiS3Enable) {
return RETURN_SUCCESS;
}
@ -821,7 +821,7 @@ S3BootScriptGetEntryAddAddress (
{
UINT8* NewEntryPtr;
if (!mAcpiS3Enable) {
if (!mS3BootScriptAcpiS3Enable) {
return NULL;
}
@ -2410,4 +2410,3 @@ S3BootScriptCompare (
return EFI_SUCCESS;
}