diff options
| author |   Borislav Petkov <bp@suse.de> | 2019-04-17 23:54:41 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-04-17 23:54:41 +0200 |
| commit | 1bddcc645f9b3d81adaf08d86289ebd733affc86 (patch) | |
| tree | 172c5af0b63f2bb7a15ddfa48d47166e00074456 /include/linux | |
| parent | Linux 5.1-rc5 (diff) | |
| parent | x86/Kconfig: Fix spelling mistake "effectivness" -> "effectiveness" (diff) | |
Merge x86/urgent into x86/cache
Merge it to pick up dependent urgent changes before applying more
resctrl stuff.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/efi.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 54357a258b35..6ebc2098cfe1 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1611,7 +1611,12 @@ efi_status_t efi_setup_gop(efi_system_table_t *sys_table_arg, struct screen_info *si, efi_guid_t *proto, unsigned long size); -bool efi_runtime_disabled(void); +#ifdef CONFIG_EFI +extern bool efi_runtime_disabled(void); +#else +static inline bool efi_runtime_disabled(void) { return true; } +#endif + extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); |