summaryrefslogtreecommitdiffstats
path: root/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-30 13:01:28 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-30 13:01:28 -0400
commit6a50f368784f29b0772f265a05b9e395bb2c23ff (patch)
tree80faccf654cbbaae2a0a74686db514f663623bb2 /efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
parent498236e304bc3f3c936ef937b2a101b9e22f6544 (diff)
downloadkernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz
kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz
kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143) - Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
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.patch2
1 files changed, 1 insertions, 1 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 6465cab3f..6fd94c8ee 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,7 +14,7 @@ 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 2ff19014117a..35268abaca99 100644
+index 1ef8ea7f8ed9..d82dc9c1c19e 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -830,8 +830,9 @@ out: