diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 18:02:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 18:02:36 -0700 |
| commit | ec4cf5dbb1887adadba2f7cbe8131facbd27a5d5 (patch) | |
| tree | fd3e110933e20b591ecaefe81554b2d650a1c039 /include/linux | |
| parent | Merge tag 'iommu-fixes-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| parent | efi: runtime: Don't assume virtual mappings are missing if VA == PA == 0 (diff) | |
| download | linux-dev-ec4cf5dbb1887adadba2f7cbe8131facbd27a5d5.tar.xz linux-dev-ec4cf5dbb1887adadba2f7cbe8131facbd27a5d5.zip | |
Merge tag 'efi-fixes-for-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel:
- fixes for the EFI variable store refactor that landed in v6.0
- fixes for issues that were introduced during the merge window
- back out some changes related to EFI zboot signing - we'll add a
better solution for this during the next cycle
* tag 'efi-fixes-for-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: runtime: Don't assume virtual mappings are missing if VA == PA == 0
efi: libstub: Fix incorrect payload size in zboot header
efi: libstub: Give efi_main() asmlinkage qualification
efi: efivars: Fix variable writes without query_variable_store()
efi: ssdt: Don't free memory if ACPI table was loaded successfully
efi: libstub: Remove zboot signing from build options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/efi.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index da3974bf05d3..80f3c1c7827d 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1085,9 +1085,6 @@ efi_status_t efivar_set_variable_locked(efi_char16_t *name, efi_guid_t *vendor, efi_status_t efivar_set_variable(efi_char16_t *name, efi_guid_t *vendor, u32 attr, unsigned long data_size, void *data); -efi_status_t check_var_size(u32 attributes, unsigned long size); -efi_status_t check_var_size_nonblocking(u32 attributes, unsigned long size); - #if IS_ENABLED(CONFIG_EFI_CAPSULE_LOADER) extern bool efi_capsule_pending(int *reset_type); |