diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-06 12:35:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-06 12:35:56 +0200 |
| commit | 8f63e9230decb06ea9068feaf0845c0eb39ab890 (patch) | |
| tree | a45cee821404ab0c7f7164e20c2f40f5e34ac16b /drivers/firmware/efi/libstub/tpm.c | |
| parent | 58ec5e9c9044bd7e1c0bcc6ad822b2e909f49732 (diff) | |
| parent | 1268ed0c474a5c8f165ef386f3310521b5e00e27 (diff) | |
Merge branch 'x86/urgent' into x86/hyperv
Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/firmware/efi/libstub/tpm.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/tpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/tpm.c b/drivers/firmware/efi/libstub/tpm.c index caa37a6dd9d4..a90b0b8fc69a 100644 --- a/drivers/firmware/efi/libstub/tpm.c +++ b/drivers/firmware/efi/libstub/tpm.c @@ -64,7 +64,7 @@ static void efi_retrieve_tpm2_eventlog_1_2(efi_system_table_t *sys_table_arg) efi_guid_t tcg2_guid = EFI_TCG2_PROTOCOL_GUID; efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID; efi_status_t status; - efi_physical_addr_t log_location, log_last_entry; + efi_physical_addr_t log_location = 0, log_last_entry = 0; struct linux_efi_tpm_eventlog *log_tbl = NULL; unsigned long first_entry_addr, last_entry_addr; size_t log_size, last_entry_size; |