diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-27 19:41:34 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-27 19:41:34 +0200 |
| commit | 1c236df71c72ab37b46eae8ed7a48c96866ce78d (patch) | |
| tree | b04ad8b42f349b3d0aae9952a26bbfa4f0384491 /0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
| parent | 13f37e7fe398411ef06f9bc489678bca23854e93 (diff) | |
| parent | 38ae8ad573eed85916454766404b352bb53c56bc (diff) | |
| download | kernel-1c236df71c72ab37b46eae8ed7a48c96866ce78d.tar.gz kernel-1c236df71c72ab37b46eae8ed7a48c96866ce78d.tar.xz kernel-1c236df71c72ab37b46eae8ed7a48c96866ce78d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc7.1.vanilla.1.fc33kernel-5.8.0-0.rc7.1.vanilla.1.fc32kernel-5.8.0-0.rc7.1.vanilla.1.fc31
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 c8e05582d..9fa2f1a8e 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 @@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com> 2 files changed, 96 insertions(+), 31 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 5114cae4ec97..93dcc37a9820 100644 +index fdd1db025dbf..8ef7d1df09dd 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -26,7 +26,7 @@ index 5114cae4ec97..93dcc37a9820 100644 #include <asm/early_ioremap.h> -@@ -827,40 +828,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -831,40 +832,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif @@ -160,7 +160,7 @@ index 5114cae4ec97..93dcc37a9820 100644 static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); diff --git a/include/linux/efi.h b/include/linux/efi.h -index bb35f3305e55..1d77c218b67e 100644 +index 05c47f857383..2e2f9f608f68 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ |