From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.4045.1617661889138837723 for ; Mon, 05 Apr 2021 15:31:29 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: michael.d.kinney@intel.com) IronPort-SDR: 9rbgEKc2KMrPB6RQrkdWlEtGoCdKZ2QlxqW1MDc/peRJ2/HUCncikcJdTTTcy/upZBaKq5hM+h 0s7B7BdNBS2Q== X-IronPort-AV: E=McAfee;i="6000,8403,9945"; a="192464676" X-IronPort-AV: E=Sophos;i="5.81,307,1610438400"; d="scan'208";a="192464676" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2021 15:31:28 -0700 IronPort-SDR: s2/Zr/AoKe2Qd/EGbIyuwAXQe3wfCUwzIbOChcIvHxKEwfEavoeI/Ga4UhCrFSlZH/CheBlgD3 735/cF7YpqLw== X-IronPort-AV: E=Sophos;i="5.81,307,1610438400"; d="scan'208";a="612293636" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.6.145]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2021 15:31:28 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Eric Dong Subject: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Date: Mon, 5 Apr 2021 15:31:20 -0700 Message-Id: <20210405223120.1228-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Hao A Wu Cc: Eric Dong Signed-off-by: Michael D Kinney --- .../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.
+ Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
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; } - -- 2.31.1.windows.1