From: Lennart Poettering Date: Wed, 16 Mar 2022 09:34:53 +0000 (+0100) Subject: boot: drop const from EFI_PHYSICAL_ADDRESS parameter X-Git-Tag: v251-rc1~136^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5a408ee35fbd843de3111e4ad78c6a53ec77f76;p=thirdparty%2Fsystemd.git boot: drop const from EFI_PHYSICAL_ADDRESS parameter It's not a pointer after all, but a numeric value. As such the const applies to the value and not the target, but we genreally don#t do that for value parameters. Hence drop the const. --- diff --git a/src/boot/efi/measure.c b/src/boot/efi/measure.c index 992acde527c..5c082b537c7 100644 --- a/src/boot/efi/measure.c +++ b/src/boot/efi/measure.c @@ -139,7 +139,7 @@ BOOLEAN tpm_present(void) { return tcg2_interface_check() || tcg1_interface_check(); } -EFI_STATUS tpm_log_event(UINT32 pcrindex, const EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description) { +EFI_STATUS tpm_log_event(UINT32 pcrindex, EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description) { EFI_TCG *tpm1; EFI_TCG2 *tpm2; diff --git a/src/boot/efi/measure.h b/src/boot/efi/measure.h index ffa49245626..33c98aaf733 100644 --- a/src/boot/efi/measure.h +++ b/src/boot/efi/measure.h @@ -6,7 +6,7 @@ #if ENABLE_TPM BOOLEAN tpm_present(void); -EFI_STATUS tpm_log_event(UINT32 pcrindex, const EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description); +EFI_STATUS tpm_log_event(UINT32 pcrindex, EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description); EFI_STATUS tpm_log_load_options(const CHAR16 *cmdline); #else @@ -14,9 +14,11 @@ EFI_STATUS tpm_log_load_options(const CHAR16 *cmdline); static inline BOOLEAN tpm_present(void) { return FALSE; } -static inline EFI_STATUS tpm_log_event(UINT32 pcrindex, const EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description) { + +static inline EFI_STATUS tpm_log_event(UINT32 pcrindex, EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description) { return EFI_SUCCESS; } + static inline EFI_STATUS tpm_log_load_options(const CHAR16 *cmdline) { return EFI_SUCCESS; }