summaryrefslogtreecommitdiffstats
path: root/Add-an-EFI-signature-blob-parser-and-key-loader.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 /Add-an-EFI-signature-blob-parser-and-key-loader.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 'Add-an-EFI-signature-blob-parser-and-key-loader.patch')
-rw-r--r--Add-an-EFI-signature-blob-parser-and-key-loader.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
index 569d4a7b4..c4feebea5 100644
--- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch
+++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@@ -159,10 +159,10 @@ index 000000000000..424896a0b169
+ return 0;
+}
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 1d54caed7ae8..1ed1fa0ea172 100644
+index fac43c611614..414c3c3d988d 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -940,6 +940,10 @@ extern bool efi_poweroff_required(void);
+@@ -941,6 +941,10 @@ extern bool efi_poweroff_required(void);
char * __init efi_md_typeattr_format(char *buf, size_t size,
const efi_memory_desc_t *md);