diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2015-11-04 10:13:38 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2015-11-04 10:13:38 -0800 |
| commit | 7c1bce7100f92ef7e4f30daef7c7c2b79124128c (patch) | |
| tree | fa13ab482917dec2620a19aa6826c22cec7a1785 /efi-Add-EFI_SECURE_BOOT-bit.patch | |
| parent | 8682d00a0e653deb1e1d0fd81732471d88d565e0 (diff) | |
| download | kernel-7c1bce7100f92ef7e4f30daef7c7c2b79124128c.tar.gz kernel-7c1bce7100f92ef7e4f30daef7c7c2b79124128c.tar.xz kernel-7c1bce7100f92ef7e4f30daef7c7c2b79124128c.zip | |
Linux v4.3-1107-g66ef349
Diffstat (limited to 'efi-Add-EFI_SECURE_BOOT-bit.patch')
| -rw-r--r-- | efi-Add-EFI_SECURE_BOOT-bit.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch index 94f7fe768..89b9664c7 100644 --- a/efi-Add-EFI_SECURE_BOOT-bit.patch +++ b/efi-Add-EFI_SECURE_BOOT-bit.patch @@ -1,4 +1,4 @@ -From b4467813ec088c13bd8c9f1eafb7c29d889d7c8f Mon Sep 17 00:00:00 2001 +From c01ff700ea4192ae04b306fef725d62189550236 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 @@ -13,10 +13,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 2 files changed, 3 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 1ac118146e90..f93826b8522c 100644 +index f3b804f..a401ff8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1137,7 +1137,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1145,7 +1145,9 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE if (boot_params.secure_boot) { @@ -27,17 +27,17 @@ index 1ac118146e90..f93826b8522c 100644 #endif diff --git a/include/linux/efi.h b/include/linux/efi.h -index 85ef051ac6fb..de3e45088d4a 100644 +index 569b5a8..4dc970e 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -959,6 +959,7 @@ extern int __init efi_setup_pcdp_console(char *); - #define EFI_PARAVIRT 6 /* Access is via a paravirt interface */ +@@ -980,6 +980,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_SECURE_BOOT 9 /* Are we in Secure Boot mode? */ + #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.4.3 +2.5.0 |