[edk2-devel] [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol

[Wu, Hao A]

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney at intel.com>
> Sent: Tuesday, April 6, 2021 6:31 AM
> To: devel at edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang at intel.com>; Wu, Hao A <hao.a.wu at intel.com>;
> Dong, Eric <eric.dong at intel.com>
> Subject: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename
> mAcpiS3Enable to avoid dup symbol
> 
> 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 at intel.com>
> Cc: Hao A Wu <hao.a.wu at intel.com>
> Cc: Eric Dong <eric.dong at intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney at intel.com>
> ---
>  .../Library/PiDxeS3BootScriptLib/BootScriptSave.c     | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> index 9315fc9f0188..9cdf47552162 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;
>    }


Reviewed-by: Hao A Wu <hao.a.wu at intel.com>

Best Regards,
Hao Wu


> 
> @@ -2410,4 +2410,3 @@ S3BootScriptCompare (
> 
>    return EFI_SUCCESS;
>  }
> -
> --
> 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#73704): https://edk2.groups.io/g/devel/message/73704
Mute This Topic: https://groups.io/mt/81876778/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-