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-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.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-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch')
| -rw-r--r-- | 0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch b/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch index ac0da4b26..ff9bcbd19 100644 --- a/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch +++ b/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch @@ -107,7 +107,7 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/include/linux/efi.h b/include/linux/efi.h -index 1d77c218b67e..f5fe3e01bc0e 100644 +index 2e2f9f608f68..6f5b3b019d3e 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -781,6 +781,14 @@ extern int __init efi_setup_pcdp_console(char *); @@ -143,7 +143,7 @@ index 1d77c218b67e..f5fe3e01bc0e 100644 static inline bool efi_soft_reserve_enabled(void) { return false; -@@ -1089,12 +1101,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1090,12 +1102,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); |