diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-10 11:02:01 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-10 11:02:01 -0600 |
commit | 73c86ebaee23df8310b903c1dab2176d443f5a3a (patch) | |
tree | 8ace519342889d31fa96e589a939ced5957f993e /0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
parent | 4139fe1eb131870a76307fd996f2e56fcd9fbe49 (diff) | |
download | kernel-73c86ebaee23df8310b903c1dab2176d443f5a3a.tar.gz kernel-73c86ebaee23df8310b903c1dab2176d443f5a3a.tar.xz kernel-73c86ebaee23df8310b903c1dab2176d443f5a3a.zip |
Linux v5.9.7 rebase
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
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 | 6 |
1 files changed, 3 insertions, 3 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..79118e12f 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); @@ -181,5 +181,5 @@ index 05c47f857383..2e2f9f608f68 100644 /* * Variable Attributes -- -2.26.2 +2.28.0 |