diff options
author | Justin Forbes <jmforbes@xps.linuxtx.org> | 2019-12-30 10:46:19 -0600 |
---|---|---|
committer | Justin Forbes <jmforbes@xps.linuxtx.org> | 2019-12-30 10:46:19 -0600 |
commit | 007e505ae0ba5e967c5aebf29885a44263042654 (patch) | |
tree | 1baae27bfc3068ef5deef05855c6980538479b6b /0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
parent | df5a06e2f275dc0e06fca38c398bc253f9f836a7 (diff) | |
download | kernel-007e505ae0ba5e967c5aebf29885a44263042654.tar.gz kernel-007e505ae0ba5e967c5aebf29885a44263042654.tar.xz kernel-007e505ae0ba5e967c5aebf29885a44263042654.zip |
Linux v5.4.6 rebase
Diffstat (limited to '0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch')
-rw-r--r-- | 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch index 0844550b6..871105093 100644 --- a/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +++ b/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch @@ -39,9 +39,9 @@ index 557a47829d0..e8f9c7d84e9 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ - #include <linux/acpi.h> #include <linux/ucs2_string.h> #include <linux/memblock.h> + #include <linux/security.h> +#include <linux/bsearch.h> #include <asm/early_ioremap.h> @@ -177,7 +177,7 @@ index 557a47829d0..e8f9c7d84e9 100644 + return found->description; } - bool efi_is_table_address(unsigned long phys_addr) + static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); -- 2.15.0 |