summaryrefslogtreecommitdiffstats
path: root/Add-an-EFI-signature-blob-parser-and-key-loader.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 /Add-an-EFI-signature-blob-parser-and-key-loader.patch
parent92add980cd854302990c88e170f914647d3ea8d4 (diff)
downloadkernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.tar.gz
kernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.tar.xz
kernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.zip
Linux v3.18-rc1-280-g816fb4175c29
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.patch8
1 files changed, 4 insertions, 4 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 e78b065cd..fb6980d8f 100644
--- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch
+++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@@ -159,12 +159,12 @@ index 000000000000..424896a0b169
+ return 0;
+}
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 5ce40e215f15..41359e548bcb 100644
+index 58d7feadd149..b1d686e9175e 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -906,6 +906,10 @@ extern bool efi_poweroff_required(void);
- (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
- (md) = (void *)(md) + (m)->desc_size)
+@@ -919,6 +919,10 @@ extern bool efi_poweroff_required(void);
+ char * __init efi_md_typeattr_format(char *buf, size_t size,
+ const efi_memory_desc_t *md);
+struct key;
+extern int __init parse_efi_signature_list(const void *data, size_t size,