summaryrefslogtreecommitdiffstats
path: root/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-24 10:02:17 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-24 10:02:17 -0400
commit3fbe156c4a0a525745f7626501fd3375e18a0a38 (patch)
tree6651d983cc0489a4587234bd4973b815770807fc /efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
parent92add980cd854302990c88e170f914647d3ea8d4 (diff)
downloadkernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.tar.gz
kernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.tar.xz
kernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.zip
Linux v3.18-rc1-280-g816fb4175c29
Diffstat (limited to 'efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch')
-rw-r--r--efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
index 928e1457c..95e5f0455 100644
--- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
@@ -14,10 +14,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index 975d11bfaf5b..94bf7819857a 100644
+index 6da2da7ac9c3..ba3cf70c7d5a 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
-@@ -817,8 +817,9 @@ out:
+@@ -831,8 +831,9 @@ out:
static int get_secure_boot(void)
{
@@ -28,7 +28,7 @@ index 975d11bfaf5b..94bf7819857a 100644
efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
efi_status_t status;
-@@ -842,6 +843,23 @@ static int get_secure_boot(void)
+@@ -856,6 +857,23 @@ static int get_secure_boot(void)
if (setup == 1)
return 0;