diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
| commit | 57957fb519449803df30d10da433c27aaad17fa5 (patch) | |
| tree | b7cf0ca9f4f8f630128afbc29de34cab93e50fa5 /include/linux | |
| parent | a9445e47d897054876b8f43e46dc5a3eca2b844d (diff) | |
| parent | ed4bbf7910b28ce3c691aef28d245585eaabda06 (diff) | |
| download | cachepc-linux-57957fb519449803df30d10da433c27aaad17fa5.tar.gz cachepc-linux-57957fb519449803df30d10da433c27aaad17fa5.zip | |
Merge branch 'timers/urgent' into timers/core, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/efi.h | 4 |
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; }; |