Reviewed-by: jiewen....@intel.com
> -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Star Zeng > Sent: Friday, September 23, 2016 10:07 AM > To: edk2-devel@lists.01.org > Cc: Yao, Jiewen <jiewen....@intel.com>; Zhang, Chao B > <chao.b.zh...@intel.com>; Zeng, Star <star.z...@intel.com> > Subject: [edk2] [PATCH] SecurityPkg Tcg2Pei: Fix GCC build failure caused by > 5919a9600e07 > > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Chao B Zhang <chao.b.zh...@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Star Zeng <star.z...@intel.com> > --- > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > index 8bd5f2cfa507..377f8d9fe45b 100644 > --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > @@ -229,9 +229,9 @@ SyncPcrAllocationsAndPcrMask ( > if ((TpmActivePcrBanks & Tpm2PcrMask) != TpmActivePcrBanks) { > NewTpmActivePcrBanks = TpmActivePcrBanks & Tpm2PcrMask; > > - DEBUG ((EFI_D_INFO, __FUNCTION__" - Reallocating PCR banks from > 0x%X to 0x%X.\n", TpmActivePcrBanks, NewTpmActivePcrBanks )); > + DEBUG ((EFI_D_INFO, "%a - Reallocating PCR banks from 0x%X to > 0x%X.\n", __FUNCTION__, TpmActivePcrBanks, NewTpmActivePcrBanks)); > if (NewTpmActivePcrBanks == 0) { > - DEBUG ((EFI_D_ERROR, __FUNCTION__" - No viable PCRs active! > Please set a less restrictive value for PcdTpm2HashMask!\n")); > + DEBUG ((EFI_D_ERROR, "%a - No viable PCRs active! Please set a > less restrictive value for PcdTpm2HashMask!\n", __FUNCTION__)); > ASSERT (FALSE); > } else { > Status = Tpm2PcrAllocateBanks (NULL, > (UINT32)TpmHashAlgorithmBitmap, NewTpmActivePcrBanks); > @@ -239,7 +239,7 @@ SyncPcrAllocationsAndPcrMask ( > // > // We can't do much here, but we hope that this doesn't happen. > // > - DEBUG ((EFI_D_ERROR, __FUNCTION__" - Failed to reallocate > PCRs!\n")); > + DEBUG ((EFI_D_ERROR, "%a - Failed to reallocate PCRs!\n", > __FUNCTION__)); > ASSERT_EFI_ERROR (Status); > } > // > @@ -256,9 +256,9 @@ SyncPcrAllocationsAndPcrMask ( > if ((Tpm2PcrMask & TpmHashAlgorithmBitmap) != Tpm2PcrMask) { > NewTpm2PcrMask = Tpm2PcrMask & TpmHashAlgorithmBitmap; > > - DEBUG ((EFI_D_INFO, __FUNCTION__" - Updating PcdTpm2HashMask > from 0x%X to 0x%X.\n", Tpm2PcrMask, NewTpm2PcrMask )); > + DEBUG ((EFI_D_INFO, "%a - Updating PcdTpm2HashMask from 0x%X > to 0x%X.\n", __FUNCTION__, Tpm2PcrMask, NewTpm2PcrMask)); > if (NewTpm2PcrMask == 0) { > - DEBUG ((EFI_D_ERROR, __FUNCTION__" - No viable PCRs > supported! Please set a less restrictive value for PcdTpm2HashMask!\n")); > + DEBUG ((EFI_D_ERROR, "%a - No viable PCRs supported! Please set > a less restrictive value for PcdTpm2HashMask!\n", __FUNCTION__)); > ASSERT (FALSE); > } > > -- > 2.7.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
