summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-05 23:20:35 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-05 23:20:35 +0300
commitb03acc4cc2c3b2338c6ee760351d010fb4708af3 (patch)
tree4b31fe20eeaba06cc9cd90352ca61065bc09e77a /include
parent3eac69038322f52b7366e4e6bbdb06e749714133 (diff)
parent81b60dbff04980a45b348c5b5eeca2713d4594ca (diff)
downloadlinux-b03acc4cc2c3b2338c6ee760351d010fb4708af3.tar.xz
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Thomas Gleixner: - A fix for a add_efi_memmap parameter regression which ensures that the parameter is parsed before it is used. - Reinstate the virtual capsule mapping as the cached copy turned out to break Quark and other things - Remove Matt Fleming as EFI co-maintainer. He stepped back a few days ago. Thanks Matt for all your great work! * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MAINTAINERS: Remove Matt Fleming as EFI co-maintainer efi/capsule-loader: Reinstate virtual capsule mapping x86/efi: Fix kernel param add_efi_memmap regression
Diffstat (limited to 'include')
-rw-r--r--include/linux/efi.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h
index d813f7b04da7..29fdf8029cf6 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -140,11 +140,13 @@ struct efi_boot_memmap {
struct capsule_info {
efi_capsule_header_t header;
+ efi_capsule_header_t *capsule;
int reset_type;
long index;
size_t count;
size_t total_size;
- phys_addr_t *pages;
+ struct page **pages;
+ phys_addr_t *phys;
size_t page_bytes_remain;
};