From b18e6e75364d806d76d99333646943f6765095fb Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 14 Apr 2015 09:54:01 -0400 Subject: Linux v4.0-2620-gb79013b2449c --- efi-Add-EFI_SECURE_BOOT-bit.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'efi-Add-EFI_SECURE_BOOT-bit.patch') diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch index df9a0dfcb..36c5d35c5 100644 --- a/efi-Add-EFI_SECURE_BOOT-bit.patch +++ b/efi-Add-EFI_SECURE_BOOT-bit.patch @@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer 2 files changed, 3 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index a3d8174dedf9..26c5d54124c1 100644 +index 88dad730e858..d99c8c38914f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1153,7 +1153,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1158,7 +1158,9 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE if (boot_params.secure_boot) { @@ -26,14 +26,14 @@ index a3d8174dedf9..26c5d54124c1 100644 #endif diff --git a/include/linux/efi.h b/include/linux/efi.h -index cf7e431cbc73..c74cbd892032 100644 +index af5be0368dec..aa4ee20ec8bb 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -942,6 +942,7 @@ extern int __init efi_setup_pcdp_console(char *); - #define EFI_64BIT 5 /* Is the firmware 64-bit? */ +@@ -943,6 +943,7 @@ extern int __init efi_setup_pcdp_console(char *); #define EFI_PARAVIRT 6 /* Access is via a paravirt interface */ #define EFI_ARCH_1 7 /* First arch-specific bit */ -+#define EFI_SECURE_BOOT 8 /* Are we in Secure Boot mode? */ + #define EFI_DBG 8 /* Print additional debug info at runtime */ ++#define EFI_SECURE_BOOT 9 /* Are we in Secure Boot mode? */ #ifdef CONFIG_EFI /* -- cgit