diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2021-04-05 15:10:32 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-04-07 16:10:59 +0000 |
| commit | 9c08b3e7d5ac177a1ecb3678004fd94164865814 (patch) | |
| tree | 03faf98ec1576ad313f3a56e1f4f147bd8b0a401 /MdeModulePkg | |
| parent | 4ac02962017c77bf38b462f970c884c2dc7931cf (diff) | |
| download | edk2-9c08b3e7d5ac177a1ecb3678004fd94164865814.tar.gz edk2-9c08b3e7d5ac177a1ecb3678004fd94164865814.tar.bz2 edk2-9c08b3e7d5ac177a1ecb3678004fd94164865814.zip | |
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>
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c index 9315fc9f01..9cdf475521 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c @@ -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;
}
-
|