diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch')
| -rw-r--r-- | 0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch index 9fa2f1a8e..507ba5cd7 100644 --- a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +++ b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch @@ -160,7 +160,7 @@ index fdd1db025dbf..8ef7d1df09dd 100644 static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 05c47f857383..2e2f9f608f68 100644 +index 73db1ae04cef..92aa4697f558 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -172,7 +172,7 @@ index 05c47f857383..2e2f9f608f68 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -828,6 +830,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) +@@ -832,6 +834,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) #endif extern int efi_status_to_err(efi_status_t status); |