diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-01 08:00:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-01 08:00:55 +0200 |
| commit | 40e52b6c177f8fc783f2fcd263ce9f8e794f1e68 (patch) | |
| tree | 1a14ca94701bffdf5767ed5a34e819b6f18e14a1 /efi-secureboot.patch | |
| parent | 422a191b6dd8e6006a1567fbb19754e9b33a0a8c (diff) | |
| parent | 9949db6070c6ca501d7235760ca8aba120db7448 (diff) | |
| download | kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc30.tar.gz kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc30.tar.xz kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc30.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc30
Diffstat (limited to 'efi-secureboot.patch')
| -rw-r--r-- | efi-secureboot.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/efi-secureboot.patch b/efi-secureboot.patch index 90ac9feca..04aacae97 100644 --- a/efi-secureboot.patch +++ b/efi-secureboot.patch @@ -166,7 +166,7 @@ index 554d795270d9..d2e17e26ac55 100644 +obj-$(CONFIG_EFI) += secureboot.o obj-$(CONFIG_APPLE_PROPERTIES) += apple-properties.o obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o - + obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 index 000000000000..de0a3714a5d4 @@ -216,10 +216,10 @@ index 5062683d4d08..6ae0e02f461e 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1126,6 +1126,14 @@ extern int __init efi_setup_pcdp_console(char *); - #define EFI_NX_PE_DATA 9 /* Can runtime data regions be mapped non-executable? */ #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ -+#define EFI_SECURE_BOOT 12 /* Are we in Secure Boot mode? */ + #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ ++#define EFI_SECURE_BOOT 13 /* Are we in Secure Boot mode? */ + +enum efi_secureboot_mode { + efi_secureboot_mode_unset, |