summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2018-01-09 03:40:59 +0300
committerJames Morris <james.l.morris@oracle.com>2018-01-09 03:40:59 +0300
commitebceb1c87c0c482d47cb92dc3cc51d28f7387716 (patch)
tree3fa626d8a7fddc9eba60dcd8c77fbf8a8ab656cd /arch/x86
parentd21bd6898336a7892914d308d5e0868f0b863571 (diff)
parent68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc (diff)
downloadlinux-ebceb1c87c0c482d47cb92dc3cc51d28f7387716.tar.xz
Merge tag 'tpmdd-next-20180108' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm
tpmdd updates for Linux 4.16
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/boot/compressed/eboot.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index e56dbc67e837..353e20c3f114 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -999,6 +999,7 @@ struct boot_params *efi_main(struct efi_config *c,
/* Ask the firmware to clear memory on unclean shutdown */
efi_enable_reset_attack_mitigation(sys_table);
+ efi_retrieve_tpm2_eventlog(sys_table);
setup_graphics(boot_params);