diff options
| author |   Ard Biesheuvel <ardb@kernel.org> | 2020-11-02 11:51:10 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2021-01-19 17:57:15 +0100 |
| commit | 3820749ddcee694abfd5ae6cabc18aaab11eab34 (patch) | |
| tree | f4412915f8629640728c22a76672e2245866fd3e | |
| parent | efi/libstub: fix prototype of efi_tcg2_protocol::get_event_log() (diff) | |
| download | linux-dev-3820749ddcee694abfd5ae6cabc18aaab11eab34.tar.xz linux-dev-3820749ddcee694abfd5ae6cabc18aaab11eab34.zip | |
efi/libstub: move TPM related prototypes into efistub.h
Move TPM related definitions that are only used in the EFI stub into
efistub.h, which is a local header.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
| -rw-r--r-- | drivers/firmware/efi/libstub/efistub.h | 9 | ||||
| -rw-r--r-- | include/linux/efi.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h index 2b7438ba1fbc..cde0a2ef507d 100644 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h @@ -849,4 +849,13 @@ void efi_handle_post_ebs_state(void); enum efi_secureboot_mode efi_get_secureboot(void); +#ifdef CONFIG_RESET_ATTACK_MITIGATION +void efi_enable_reset_attack_mitigation(void); +#else +static inline void +efi_enable_reset_attack_mitigation(void) { } +#endif + +void efi_retrieve_tpm2_eventlog(void); + #endif diff --git a/include/linux/efi.h b/include/linux/efi.h index 2537a246c2d6..8710f5710c1d 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1104,13 +1104,6 @@ enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) return efi_secureboot_mode_enabled; } -#ifdef CONFIG_RESET_ATTACK_MITIGATION -void efi_enable_reset_attack_mitigation(void); -#else -static inline void -efi_enable_reset_attack_mitigation(void) { } -#endif - #ifdef CONFIG_EFI_EMBEDDED_FIRMWARE void efi_check_for_embedded_firmwares(void); #else @@ -1119,8 +1112,6 @@ static inline void efi_check_for_embedded_firmwares(void) { } efi_status_t efi_random_get_seed(void); -void efi_retrieve_tpm2_eventlog(void); - /* * Arch code can implement the following three template macros, avoiding * reptition for the void/non-void return cases of {__,}efi_call_virt(): |