diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-11 08:17:27 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-11 08:17:27 +0200 |
| commit | f4378e08e859b69c65ddecca8c860db9d9f67131 (patch) | |
| tree | 8d9685208820449179e55a6c0b4f8772e02f74f9 /efi-Add-EFI_SECURE_BOOT-bit.patch | |
| parent | 45b5f6d3056805626154f40d9dfc6d43bf43e936 (diff) | |
| parent | 46d554b218abd67b9670498cf54cac499c9f826d (diff) | |
| download | kernel-f4378e08e859b69c65ddecca8c860db9d9f67131.tar.gz kernel-f4378e08e859b69c65ddecca8c860db9d9f67131.tar.xz kernel-f4378e08e859b69c65ddecca8c860db9d9f67131.zip | |
merge origin
Diffstat (limited to 'efi-Add-EFI_SECURE_BOOT-bit.patch')
| -rw-r--r-- | efi-Add-EFI_SECURE_BOOT-bit.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch deleted file mode 100644 index c44010322..000000000 --- a/efi-Add-EFI_SECURE_BOOT-bit.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a8883aff32f1e15b65e210462804aa2a9ab9a0b6 Mon Sep 17 00:00:00 2001 -From: Josh Boyer <jwboyer@fedoraproject.org> -Date: Tue, 27 Aug 2013 13:33:03 -0400 -Subject: [PATCH 13/20] efi: Add EFI_SECURE_BOOT bit - -UEFI machines can be booted in Secure Boot mode. Add a EFI_SECURE_BOOT bit -for use with efi_enabled. - -Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> ---- - arch/x86/kernel/setup.c | 2 ++ - include/linux/efi.h | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index d40e961753c9..b93183336674 100644 ---- a/arch/x86/kernel/setup.c -+++ b/arch/x86/kernel/setup.c -@@ -1162,7 +1162,9 @@ void __init setup_arch(char **cmdline_p) - - #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE - if (boot_params.secure_boot) { -+ set_bit(EFI_SECURE_BOOT, &efi.flags); - enforce_signed_modules(); -+ pr_info("Secure boot enabled\n"); - } - #endif - -diff --git a/include/linux/efi.h b/include/linux/efi.h -index ce943d5accfd..5af91b58afae 100644 ---- a/include/linux/efi.h -+++ b/include/linux/efi.h -@@ -1046,6 +1046,7 @@ extern int __init efi_setup_pcdp_console(char *); - #define EFI_ARCH_1 7 /* First arch-specific bit */ - #define EFI_DBG 8 /* Print additional debug info at runtime */ - #define EFI_NX_PE_DATA 9 /* Can runtime data regions be mapped non-executable? */ -+#define EFI_SECURE_BOOT 10 /* Are we in Secure Boot mode? */ - - #ifdef CONFIG_EFI - /* --- -2.9.3 - |